Merge pull request #189 from Unity-Technologies/usim-app-param-fix

App-params now deserialize from the correct location in USim

Author: sleal-unity

com.unity.perception/Editor/Randomization/Editors/RandomizerTagEditor.cs

@@ -1,32 +1,11 @@
 using UnityEditor;
+using UnityEditor.Perception.Randomization;
 using UnityEditor.UIElements;
 using UnityEngine.Perception.Randomization.Randomizers;
 using UnityEngine.UIElements;
 
 namespace UnityEngine.Perception.Randomization.Editor
 {
     [CustomEditor(typeof(RandomizerTag), true)]
-    public class RandomizerTagEditor : UnityEditor.Editor
-    {
-        public override VisualElement CreateInspectorGUI()
-        {
-            var rootElement = new VisualElement();
-            CreatePropertyFields(rootElement);
-            return rootElement;
-        }
-
-        void CreatePropertyFields(VisualElement rootElement)
-        {
-            var iterator = serializedObject.GetIterator();
-            iterator.NextVisible(true);
-            do
-            {
-                if (iterator.name == "m_Script")
-                    continue;
-                var propertyField = new PropertyField(iterator.Copy());
-                propertyField.Bind(serializedObject);
-                rootElement.Add(propertyField);
-            } while (iterator.NextVisible(false));
-        }
-    }
+    class RandomizerTagEditor : ParameterUIElementsEditor { }
 }

com.unity.perception/Editor/Randomization/Utilities/UIElementsEditorUtilities.cs

@@ -22,12 +22,14 @@ public static void CreatePropertyFields(SerializedObject serializedObj, VisualEl
             var fieldType = serializedObj.targetObject.GetType();
             var iterator = serializedObj.GetIterator();
             iterator.NextVisible(true);
-            iterator.NextVisible(false);
-            do
+            if (iterator.NextVisible(false))
             {
-                var propertyField = CreatePropertyField(iterator, fieldType);
-                containerElement.Add(propertyField);
-            } while (iterator.NextVisible(false));
+                do
+                {
+                    var propertyField = CreatePropertyField(iterator, fieldType);
+                    containerElement.Add(propertyField);
+                } while (iterator.NextVisible(false));
+            }
         }
 
         /// <summary>
@@ -39,19 +41,19 @@ public static void CreatePropertyFields(SerializedObject serializedObj, VisualEl
         public static void CreatePropertyFields(SerializedProperty property, VisualElement containerElement)
         {
             var fieldType = StaticData.GetManagedReferenceValue(property).GetType();
-
             var iterator = property.Copy();
             var nextSiblingProperty = property.Copy();
             nextSiblingProperty.NextVisible(false);
-
             if (iterator.NextVisible(true))
+            {
                 do
                 {
                     if (SerializedProperty.EqualContents(iterator, nextSiblingProperty))
                         break;
                     var propertyField = CreatePropertyField(iterator, fieldType);
                     containerElement.Add(propertyField);
                 } while (iterator.NextVisible(false));
+            }
         }
 
         /// <summary>

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

@@ -321,6 +321,7 @@ static Vector3 CalculateRotatedPoint(Camera cam, Vector3 start, Vector3 xDirecti
             return VisualizationHelper.ConvertToScreenSpace(cam, worldPoint);
         }
 
+        /// <inheritdoc/>
         protected override void OnVisualize()
         {
             if (m_ToReport == null) return;

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

@@ -115,18 +115,19 @@ static JObject SerializeSampler(ISampler sampler)
         /// <inheritdoc/>
         public override void DeserializeFromFile(string configFilePath)
         {
-            if (string.IsNullOrEmpty(configFilePath))
-                throw new ArgumentNullException();
-            if (!File.Exists(configFilePath))
-                throw new FileNotFoundException($"A scenario configuration file does not exist at path {configFilePath}");
+            if (string.IsNullOrEmpty(configFilePath) || !File.Exists(configFilePath))
+                Debug.Log($"No configuration file found at {defaultConfigFilePath}");
+            else
+            {
 #if UNITY_EDITOR
-            Debug.Log($"Deserialized scenario configuration from <a href=\"file:///${configFilePath}\">{configFilePath}</a>. " +
-                "Using undo in the editor will revert these changes to your scenario.");
+                Debug.Log($"Deserialized scenario configuration from <a href=\"file:///${configFilePath}\">{configFilePath}</a>. " +
+                    "Using undo in the editor will revert these changes to your scenario.");
 #else
-            Debug.Log($"Deserialized scenario configuration from <a href=\"file:///${configFilePath}\">{configFilePath}</a>");
+                Debug.Log($"Deserialized scenario configuration from <a href=\"file:///${configFilePath}\">{configFilePath}</a>");
 #endif
-            var jsonText = File.ReadAllText(configFilePath);
-            DeserializeFromJson(jsonText);
+                var jsonText = File.ReadAllText(configFilePath);
+                DeserializeFromJson(jsonText);
+            }
         }
 
         /// <inheritdoc/>

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

@@ -85,7 +85,7 @@ private set
         /// <summary>
         /// Returns the absolute file path of the JSON serialized configuration
         /// </summary>
-        public string defaultConfigFilePath =>
+        public virtual string defaultConfigFilePath =>
             Application.dataPath + "/StreamingAssets/" + configFileName + ".json";
 
         /// <summary>
@@ -165,6 +165,15 @@ public void DeserializeFromFile()
             DeserializeFromFile(defaultConfigFilePath);
         }
 
+        /// <summary>
+        /// Resets SamplerState.randomState with a new seed value generated by hashing this Scenario's randomSeed
+        /// with its currentIteration
+        /// </summary>
+        protected virtual void ResetRandomStateOnIteration()
+        {
+            SamplerState.randomState = SamplerUtility.IterateSeed((uint)currentIteration, genericConstants.randomSeed);
+        }
+
         /// <summary>
         /// This method executed directly after this scenario has been registered and initialized
         /// </summary>
@@ -204,11 +213,7 @@ void Start()
                 Guid.Parse("14adb394-46c0-47e8-a3f0-99e754483b76"));
             DatasetCapture.ReportMetric(randomSeedMetricDefinition, new[] { genericConstants.randomSeed });
 #if !UNITY_EDITOR
-            if (File.Exists(defaultConfigFilePath))
-                DeserializeFromFile();
-            else
-                Debug.Log($"No configuration file found at {defaultConfigFilePath}. " +
-                    "Proceeding with built in scenario constants and randomizer settings.");
+            DeserializeFromFile();
 #endif
         }
 
@@ -272,8 +277,7 @@ void Update()
             if (currentIterationFrame == 0)
             {
                 DatasetCapture.StartNewSequence();
-                SamplerState.randomState = SamplerUtility.IterateSeed((uint)currentIteration, genericConstants.randomSeed);
-
+                ResetRandomStateOnIteration();
                 DatasetCapture.ReportMetric(m_IterationMetricDefinition, new[]
                 {
                     new IterationMetricData()

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

@@ -1,5 +1,7 @@
 using System;
+using System.IO;
 using Unity.Simulation;
+using UnityEngine.Perception.Randomization.Samplers;
 
 namespace UnityEngine.Perception.Randomization.Scenarios
 {
@@ -12,6 +14,12 @@ namespace UnityEngine.Perception.Randomization.Scenarios
         /// <inheritdoc/>
         public sealed override bool isScenarioComplete => currentIteration >= constants.totalIterations;
 
+        /// <inheritdoc/>
+        public override string defaultConfigFilePath =>
+            Configuration.Instance.IsSimulationRunningInCloud()
+                ? new Uri(Configuration.Instance.SimulationConfig.app_param_uri).LocalPath
+                : base.defaultConfigFilePath;
+
         /// <inheritdoc/>
         protected sealed override void IncrementIteration()
         {
@@ -21,10 +29,8 @@ protected sealed override void IncrementIteration()
         /// <inheritdoc/>
         public sealed override void DeserializeFromFile(string configFilePath)
         {
-            base.DeserializeFromFile(Configuration.Instance.IsSimulationRunningInCloud()
-                ? new Uri(Configuration.Instance.SimulationConfig.app_param_uri).LocalPath
-                : configFilePath);
-            currentIteration = constants.instanceIndex;
+            base.DeserializeFromFile(configFilePath);
+            currentIteration = constants.instanceIndex * constants.instanceCount;
         }
     }
 }