Merge branch 'master' into fix_label_config_editor_indexing

Author: mkamalza

README.md

@@ -7,9 +7,9 @@
 [![license badge](https://img.shields.io/badge/license-Apache--2.0-green.svg)](LICENSE.md)
 
 <img src="https://img.shields.io/badge/unity-2019.4-green.svg?style=flat-square" alt="unity 2019.4">
-<img src="https://img.shields.io/badge/unity-2020.3-green.svg?style=flat-square" alt="unity 2020.3">
+<img src="https://img.shields.io/badge/unity-2020.2-green.svg?style=flat-square" alt="unity 2020.3">
 
-> com.unity.perception is in active development. Its features and API are subject to significant change as development progresses.
+> `com.unity.perception` is in active development. Its features and API are subject to significant change as development progresses.
 
 
 # Perception Package ([Unity Computer Vision](https://unity.com/computer-vision))

TestProjects/PerceptionHDRP/Packages/packages-lock.json

@@ -81,7 +81,7 @@
         "com.unity.collections": "0.9.0-preview.6",
         "com.unity.nuget.newtonsoft-json": "1.1.2",
         "com.unity.render-pipelines.core": "7.1.6",
-        "com.unity.simulation.capture": "0.0.10-preview.20",
+        "com.unity.simulation.capture": "0.0.10-preview.23",
         "com.unity.simulation.client": "0.0.10-preview.10",
         "com.unity.simulation.core": "0.0.10-preview.22"
       }
@@ -126,11 +126,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.simulation.capture": {
-      "version": "0.0.10-preview.20",
+      "version": "0.0.10-preview.23",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.simulation.core": "0.0.10-preview.22"
+        "com.unity.simulation.core": "0.0.10-preview.25"
       },
       "url": "https://packages.unity.com"
     },
@@ -142,10 +142,12 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.simulation.core": {
-      "version": "0.0.10-preview.22",
-      "depth": 1,
+      "version": "0.0.10-preview.25",
+      "depth": 2,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.nuget.newtonsoft-json": "2.0.0-preview"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {

TestProjects/PerceptionURP/Assets/Tests/Editor/PerceptionCameraEditorUrpTests.cs

@@ -42,7 +42,6 @@ public IEnumerator MissingRendererFeature_ProducesLogError()
             gameObject.SetActive(false);
             gameObject.AddComponent<Camera>();
             gameObject.AddComponent<UniversalAdditionalCameraData>();
-            
             var perceptionCamera = gameObject.AddComponent<PerceptionCamera>();
             gameObject.SetActive(true);
             LogAssert.Expect(LogType.Error, "GroundTruthRendererFeature must be present on the ScriptableRenderer associated with the camera. The ScriptableRenderer can be accessed through Edit -> Project Settings... -> Graphics -> Scriptable Render Pipeline Settings -> Renderer List.");

TestProjects/PerceptionURP/Packages/packages-lock.json

@@ -81,7 +81,7 @@
         "com.unity.collections": "0.9.0-preview.6",
         "com.unity.nuget.newtonsoft-json": "1.1.2",
         "com.unity.render-pipelines.core": "7.1.6",
-        "com.unity.simulation.capture": "0.0.10-preview.20",
+        "com.unity.simulation.capture": "0.0.10-preview.23",
         "com.unity.simulation.client": "0.0.10-preview.10",
         "com.unity.simulation.core": "0.0.10-preview.22"
       }
@@ -115,11 +115,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.simulation.capture": {
-      "version": "0.0.10-preview.20",
+      "version": "0.0.10-preview.23",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.simulation.core": "0.0.10-preview.22"
+        "com.unity.simulation.core": "0.0.10-preview.25"
       },
       "url": "https://packages.unity.com"
     },
@@ -131,10 +131,12 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.simulation.core": {
-      "version": "0.0.10-preview.22",
-      "depth": 1,
+      "version": "0.0.10-preview.25",
+      "depth": 2,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.nuget.newtonsoft-json": "2.0.0-preview"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {

TestProjects/PerceptionURP/ProjectSettings/BurstAotSettings_StandaloneOSX.json

@@ -0,0 +1,15 @@
+{
+  "MonoBehaviour": {
+    "Version": 3,
+    "EnableBurstCompilation": true,
+    "EnableOptimisations": true,
+    "EnableSafetyChecks": false,
+    "EnableDebugInAllBuilds": false,
+    "UsePlatformSDKLinker": false,
+    "CpuMinTargetX32": 0,
+    "CpuMaxTargetX32": 0,
+    "CpuMinTargetX64": 0,
+    "CpuMaxTargetX64": 0,
+    "CpuTargetsX64": 72
+  }
+}

com.unity.perception/CHANGELOG.md

@@ -13,13 +13,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-User can now choose the base folder location to store their generated data.
+The user can now choose the base folder location to store their generated datasets.
 
 Added a `projection` field in the capture.sensor metadata. Values are either "perspective" or "orthographic".
 
 ### Changed
 
-Changed the JSON serialization key of Normal Sampler's standard deviation property from "standardDeviation" to "stddev". Scenario JSON configurations that were generated using previous versions will need to be manually updated to reflect this change.
+Changed the JSON serialization key of Normal Sampler's standard deviation property from "standardDeviation" to "stddev". Scneario JSON configurations that were generated using previous versions will need to be manually updated to reflect this change.
 
 ### Deprecated
 
@@ -35,6 +35,8 @@ Fixed an indexing issue with the IdLabelConfig editor. When a new label was adde
 
 ### Known Issues
 
+When using URP in OSX, having MSAA enabled on the camera while the post-processing option is disabled may cause the output RGB images to be blank. As a workaround, you can disable MSAA and use FXAA instead, until the issue is fixed.
+
 ### Added
 
 Added support for 'step' button in editor.

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

@@ -224,12 +224,12 @@ private void OnRenderedObjectInfoReadback(int frameCount, NativeArray<RenderedOb
                         {
                             include = true;
                             break;
-                }
-            }
+                        }
+                    }
 
                     if (!include && objectFilter == KeypointObjectFilter.VisibleAndOccluded)
                         include = keypointSet.Value.keypoints.Any(k => k.state == 1);
-        }
+                }
                 if (include)
                     m_KeypointEntriesToReport.Add(entry);
             }
@@ -617,4 +617,4 @@ KeypointJson TemplateToJson(KeypointTemplate input)
             return json;
         }
     }
-}
+}

com.unity.perception/Tests/Editor/PerceptionCameraEditorTests.cs

@@ -12,7 +12,6 @@
 using Moq;
 using Moq.Protected;
 using UnityEngine.Rendering;
-
 #endif
 
 namespace EditorTests
@@ -205,8 +204,11 @@ static GameObject SetupCamera(Action<PerceptionCamera> initPerceptionCameraCallb
             var camera = cameraObject.AddComponent<Camera>();
             camera.orthographic = true;
             camera.orthographicSize = 1;
+
 #if HDRP_PRESENT
             cameraObject.AddComponent<UnityEngine.Rendering.HighDefinition.HDAdditionalCameraData>();
+#elif URP_PRESENT
+            cameraObject.AddComponent<UnityEngine.Rendering.Universal.UniversalAdditionalCameraData>();
 #endif
 
             var perceptionCamera = cameraObject.AddComponent<PerceptionCamera>();