Merge pull request #240 from Unity-Technologies/remove-entities-dependency

Remove entities dependency

Author: sleal-unity

com.unity.perception/CHANGELOG.md

@@ -29,6 +29,8 @@ The color of keypoints and connections are now reported in the annotation defini
 
 The PerceptionScenario abstract class has been added to abstract perception data capture specific functionality from the vanilla scenario lifecycle. 
 
+The newly added LabelManager class now enables custom Labelers to access the list of registered Labeling Components present in the scene.
+
 Improved UI for KeypointTemplate and added useful default colors for keypoint and skeleton definitions.
 
 ### Changed
@@ -53,6 +55,8 @@ The randomizer methods OnCreate(), OnStartRunning(), and OnStopRunning() are now
 
 ### Removed
 
+Removed the entities package dependency
+
 ### Fixed
 
 Fixed a null reference error that appeared when adding options to categorical parameters.

com.unity.perception/Editor/GroundTruth/InstanceSegmentationPassEditor.cs

@@ -1,5 +1,4 @@
 #if HDRP_PRESENT
-
 using UnityEditor.Rendering.HighDefinition;
 using UnityEngine.Perception.GroundTruth;
 
@@ -10,7 +9,7 @@ public class InstanceSegmentationPassEditor : BaseCustomPassDrawer
     {
         protected override void Initialize(SerializedProperty customPass)
         {
-            var targetCameraProperty = customPass.FindPropertyRelative(nameof(GroundTruthPass.targetCamera));
+            var targetCameraProperty = customPass.FindPropertyRelative(nameof(InstanceSegmentationPass.targetCamera));
             AddProperty(targetCameraProperty);
             AddProperty(customPass.FindPropertyRelative(nameof(InstanceSegmentationPass.targetTexture)));
             base.Initialize(customPass);

com.unity.perception/Runtime/GroundTruth/GroundTruthInfo.cs

@@ -2,83 +2,10 @@
 using System;
 using UnityEditor;
 using UnityEngine;
-using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
 
 namespace UnityEngine.Perception.GroundTruth
 {
-    class InstanceSegmentationUrpPass : ScriptableRenderPass
-    {
-        InstanceSegmentationCrossPipelinePass m_InstanceSegmentationPass;
-
-        public InstanceSegmentationUrpPass(Camera camera, RenderTexture targetTexture)
-        {
-            m_InstanceSegmentationPass = new InstanceSegmentationCrossPipelinePass(camera);
-            ConfigureTarget(targetTexture, targetTexture.depthBuffer);
-            m_InstanceSegmentationPass.Setup();
-        }
-
-        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
-        {
-            var commandBuffer = CommandBufferPool.Get(nameof(InstanceSegmentationUrpPass));
-            m_InstanceSegmentationPass.Execute(context, commandBuffer, renderingData.cameraData.camera, renderingData.cullResults);
-            CommandBufferPool.Release(commandBuffer);
-        }
-
-        public void Cleanup()
-        {
-            m_InstanceSegmentationPass.Cleanup();
-        }
-    }
-
-    class SemanticSegmentationUrpPass : ScriptableRenderPass
-    {
-        public SemanticSegmentationCrossPipelinePass m_SemanticSegmentationCrossPipelinePass;
-
-        public SemanticSegmentationUrpPass(Camera camera, RenderTexture targetTexture, SemanticSegmentationLabelConfig labelConfig)
-        {
-            m_SemanticSegmentationCrossPipelinePass = new SemanticSegmentationCrossPipelinePass(camera, labelConfig);
-            ConfigureTarget(targetTexture, targetTexture.depthBuffer);
-            m_SemanticSegmentationCrossPipelinePass.Setup();
-        }
-
-        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
-        {
-            var commandBuffer = CommandBufferPool.Get(nameof(SemanticSegmentationUrpPass));
-            m_SemanticSegmentationCrossPipelinePass.Execute(context, commandBuffer, renderingData.cameraData.camera, renderingData.cullResults);
-            CommandBufferPool.Release(commandBuffer);
-        }
-
-        public void Cleanup()
-        {
-            m_SemanticSegmentationCrossPipelinePass.Cleanup();
-        }
-    }
-
-    class LensDistortionUrpPass : ScriptableRenderPass
-    {
-        public LensDistortionCrossPipelinePass m_LensDistortionCrossPipelinePass;
-
-        public LensDistortionUrpPass(Camera camera, RenderTexture targetTexture)
-        {
-            m_LensDistortionCrossPipelinePass = new LensDistortionCrossPipelinePass(camera, targetTexture);
-            ConfigureTarget(targetTexture, targetTexture.depthBuffer);
-            m_LensDistortionCrossPipelinePass.Setup();
-        }
-
-        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
-        {
-            var commandBuffer = CommandBufferPool.Get(nameof(SemanticSegmentationUrpPass));
-            m_LensDistortionCrossPipelinePass.Execute(context, commandBuffer, renderingData.cameraData.camera, renderingData.cullResults);
-            CommandBufferPool.Release(commandBuffer);
-        }
-
-        public void Cleanup()
-        {
-            m_LensDistortionCrossPipelinePass.Cleanup();
-        }
-    }
-
     public class GroundTruthRendererFeature : ScriptableRendererFeature
     {
         public override void Create() {}
@@ -95,7 +22,7 @@ public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingD
             if (!EditorApplication.isPlaying)
                 return;
 #endif
-            perceptionCamera.OnGroundTruthRendererFeatureRun();
+            perceptionCamera.MarkGroundTruthRendererFeatureAsPresent();
             foreach (var pass in perceptionCamera.passes)
                 renderer.EnqueuePass(pass);
         }

com.unity.perception/Runtime/GroundTruth/GroundTruthInfo.cs.meta

@@ -3,12 +3,12 @@
 namespace UnityEngine.Perception.GroundTruth
 {
     /// <summary>
-    /// Interface for setting up MeshRenderers for ground truth generation via <see cref="GroundTruthLabelSetupSystem"/>.
+    /// Interface for setting up Renderers for ground truth generation via <see cref="LabelManager"/>.
     /// </summary>
     public interface IGroundTruthGenerator
     {
         /// <summary>
-        /// Called by <see cref="GroundTruthLabelSetupSystem"/> when first registered or when a Labeling is created at runtime.
+        /// Called by <see cref="LabelManager"/> when first registered or when a Labeling is created at runtime.
         /// </summary>
         /// <param name="mpb">The MaterialPropertyBlock for the given meshRenderer. Can be used to set properties for custom rendering.</param>
         /// <param name="renderer">The Renderer under the given Labeling.</param>

com.unity.perception/Runtime/GroundTruth/GroundTruthLabelSetupSystem.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Unity.Collections;
-using Unity.Entities;
 using Unity.Profiling;
 
 namespace UnityEngine.Perception.GroundTruth
@@ -14,8 +13,6 @@ namespace UnityEngine.Perception.GroundTruth
     /// </summary>
     public class BoundingBox3DLabeler : CameraLabeler
     {
-        EntityQuery m_EntityQuery;
-
         ///<inheritdoc/>
         public override string description
         {
@@ -114,7 +111,7 @@ public BoundingBox3DLabeler() {}
         /// <param name="labelConfig">The label config for resolving the label for each object.</param>
         public BoundingBox3DLabeler(IdLabelConfig labelConfig)
         {
-            this.idLabelConfig = labelConfig;
+            idLabelConfig = labelConfig;
         }
 
         /// <inheritdoc/>
@@ -128,8 +125,6 @@ protected override void Setup()
 
             perceptionCamera.RenderedObjectInfosCalculated += OnRenderObjectInfosCalculated;
 
-            m_EntityQuery = World.DefaultGameObjectInjectionWorld.EntityManager.CreateEntityQuery(typeof(Labeling), typeof(GroundTruthInfo));
-
             m_AsyncAnnotations = new Dictionary<int, AsyncAnnotation>();
             m_BoundingBoxValues = new Dictionary<int, Dictionary<uint, BoxData>>();
             m_ToReport = new List<BoxData>();
@@ -187,15 +182,8 @@ protected override void OnBeginRendering()
 
             m_AsyncAnnotations[m_CurrentFrame] = perceptionCamera.SensorHandle.ReportAnnotationAsync(m_AnnotationDefinition);
 
-            var entities = m_EntityQuery.ToEntityArray(Allocator.TempJob);
-            var entityManager = World.DefaultGameObjectInjectionWorld.EntityManager;
-
-            foreach (var entity in entities)
-            {
-                ProcessEntity(entityManager.GetComponentObject<Labeling>(entity));
-            }
-
-            entities.Dispose();
+            foreach (var label in LabelManager.singleton.registeredLabels)
+                ProcessLabel(label);
         }
 
         void OnRenderObjectInfosCalculated(int frameCount, NativeArray<RenderedObjectInfo> renderedObjectInfos)
@@ -228,7 +216,7 @@ void OnRenderObjectInfosCalculated(int frameCount, NativeArray<RenderedObjectInf
             }
         }
 
-        void ProcessEntity(Labeling labeledEntity)
+        void ProcessLabel(Labeling labeledEntity)
         {
             using (s_BoundingBoxCallback.Auto())
             {