Merge branch 'master' into undo-moved-from

Author: sleal-unity

com.unity.perception/CHANGELOG.md

@@ -75,6 +75,8 @@ Semantic Segmentation Labeler now places data in folders with randomized filenam
 
 The uniform toggle on Categorical Parameters will now reset the Parameter's probability weights to be uniform.
 
+Reorganized Perception MonoBehaviour paths within the AddComponentMenu.
+
 ### Deprecated
 
 ### Removed

com.unity.perception/Runtime/GroundTruth/Labelers/InstanceSegmentationLabeler.cs

@@ -117,14 +117,17 @@ void OnRenderedObjectInfosCalculated(int frame, NativeArray<RenderedObjectInfo>
             }
         }
 
-        void OnImageCaptured(int frame, NativeArray<Color32> data, RenderTexture renderTexture)
+        void OnImageCaptured(int frameCount, NativeArray<Color32> data, RenderTexture renderTexture)
         {
+            if (!m_AsyncAnnotations.ContainsKey(frameCount))
+                return;
+
             using (s_OnImageReceivedCallback.Auto())
             {
                 m_CurrentTexture = renderTexture;
 
-                m_InstancePath = $"{k_Directory}/{k_FilePrefix}{frame}.png";
-                var localPath = $"{Manager.Instance.GetDirectoryFor(k_Directory)}/{k_FilePrefix}{frame}.png";
+                m_InstancePath = $"{k_Directory}/{k_FilePrefix}{frameCount}.png";
+                var localPath = $"{Manager.Instance.GetDirectoryFor(k_Directory)}/{k_FilePrefix}{frameCount}.png";
 
                 var colors = new NativeArray<Color32>(data, Allocator.TempJob);
 

com.unity.perception/Runtime/GroundTruth/Labelers/JointLabel.cs

@@ -8,6 +8,7 @@ namespace UnityEngine.Perception.GroundTruth
     /// Label to designate a custom joint/keypoint. These are needed to add body
     /// parts to a humanoid model that are not contained in its <see cref="Animator"/> <see cref="Avatar"/>
     /// </summary>
+    [AddComponentMenu("Perception/Labeling/Joint Label")]
     public class JointLabel : MonoBehaviour
     {
         /// <summary>

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

@@ -8,6 +8,7 @@ namespace UnityEngine.Perception.GroundTruth
     /// <summary>
     /// Defines a set of labels associated with the object and its descendants. A Labeling component will override any Labeling components on the object's ancestors.
     /// </summary>
+    [AddComponentMenu("Perception/Labeling/Labeling")]
     public class Labeling : MonoBehaviour
     {
         /// <summary>

com.unity.perception/Runtime/Randomization/Scenarios/FixedLengthScenario.cs

@@ -5,7 +5,7 @@ namespace UnityEngine.Perception.Randomization.Scenarios
     /// <summary>
     /// A scenario that runs for a fixed number of frames during each iteration
     /// </summary>
-    [AddComponentMenu("Perception/Randomization/Scenarios/Fixed Length Scenario")]
+    [AddComponentMenu("Perception/Scenarios/Fixed Length Scenario")]
     public class FixedLengthScenario: UnitySimulationScenario<FixedLengthScenario.Constants>
     {
         /// <summary>