Updated samples for com.unity.physics@0.6.0-preview.3

Author: seanp-unity

UnityPhysicsSamples/Assets/Common/Scripts/MousePick/MousePickBehaviour.cs

@@ -13,30 +13,6 @@
 
 namespace Unity.Physics.Extensions
 {
-    public class ColliderUtils
-    {
-        [BurstCompile]
-        public static bool IsTrigger(BlobAssetReference<Collider> collider, ColliderKey key)
-        {
-            bool bIsTrigger = false;
-            unsafe
-            {
-                var c = (Collider*)collider.GetUnsafePtr();
-                {
-                    var cc = ((ConvexCollider*)c);
-                    if (cc->CollisionType != CollisionType.Convex)
-                    {
-                        c->GetLeaf(key, out ChildCollider child);
-                        cc = (ConvexCollider*)child.Collider;
-                        Assert.IsTrue(cc->CollisionType == CollisionType.Convex);
-                    }
-                    bIsTrigger = cc->Material.CollisionResponse == CollisionResponsePolicy.RaiseTriggerEvents;
-                }
-            }
-            return bIsTrigger;
-        }
-    }
-
     // A mouse pick collector which stores every hit. Based off the ClosestHitCollector
     [BurstCompile]
     public struct MousePickCollector : ICollector<RaycastHit>
@@ -71,8 +47,7 @@ public bool AddHit(RaycastHit hit)
             var isAcceptable = (hit.RigidBodyIndex >= 0) && (hit.RigidBodyIndex < NumDynamicBodies);
             if (IgnoreTriggers)
             {
-                var body = Bodies[hit.RigidBodyIndex];
-                isAcceptable = isAcceptable && !ColliderUtils.IsTrigger(body.Collider, hit.ColliderKey);
+                isAcceptable = isAcceptable && hit.Material.CollisionResponse != CollisionResponsePolicy.RaiseTriggerEvents;
             }
 
             if (!isAcceptable)

UnityPhysicsSamples/Assets/Common/Scripts/RayTracer/RayTracer.cs

@@ -18,18 +18,24 @@ public class RayTracer : MonoBehaviour
         public float RayLength = 100.0f;
         public float AmbientLight = 0.2f;
         public GameObject DisplayTarget;
-        int ImageRes = 100;
+
+        int imageRes = 100;
         float planeHalfExtents = 5.0f; /// Half extents of the created primitive plane
 
-        RayTracerSystem.RayResult lastResults;
-        bool ExpectingResults;
+        RayTracerSystem.RayResult nextResults;
 
         private void OnDisable()
         {
-            if (ExpectingResults)
+            if (nextResults.PixelData.IsCreated)
             {
-                lastResults.PixelData.Dispose();
-                ExpectingResults = false;
+                RayTracerSystem rbs;
+                var world = World.DefaultGameObjectInjectionWorld;
+                if (world != null && null != (rbs = world.GetExistingSystem<RayTracerSystem>()))
+                {
+                    // Needed before calling PixelData.Dispose()
+                    rbs.GetOutputDependency().Complete();
+                }
+                nextResults.Dispose();
             }
         }
 
@@ -50,8 +56,7 @@ void Start()
 
             imageDisplay.GetComponent<MeshRenderer>().shadowCastingMode = ShadowCastingMode.Off;
 
-            // For 2019.1: // blasterTexture = new Texture2D(ImageRes, ImageRes, UnityEngine.Experimental.Rendering.GraphicsFormat.R32G32B32A32_UInt , UnityEngine.Experimental.Rendering.TextureCreationFlags.None);
-            blasterTexture = new Texture2D(ImageRes, ImageRes);
+            blasterTexture = new Texture2D(imageRes, imageRes);
             blasterTexture.filterMode = FilterMode.Point;
 
             blasterMaterial = new UnityEngine.Material(imageDisplay.GetComponent<MeshRenderer>().materials[0]);
@@ -67,12 +72,19 @@ void Start()
 
         void Update()
         {
-            Vector3 imageCenter = transform.TransformPoint(new Vector3(0, 0, -ImagePlane));
+            if (World.DefaultGameObjectInjectionWorld == null) return;
 
-            if (ExpectingResults)
+            RayTracerSystem rbs = World.DefaultGameObjectInjectionWorld.GetExistingSystem<RayTracerSystem>();
+            if (rbs == null || !rbs.IsEnabled || !rbs.GetOutputDependency().IsCompleted) return;
+
+            if (nextResults.PixelData.IsCreated)
             {
-                NativeStream.Reader reader = lastResults.PixelData.AsReader();
-                for (int i = 0; i < lastResults.PixelData.ForEachCount; i++)
+                // rbs.GetOutputDependency().IsCompleted is true here
+                // so this is only needed to quieten the JobsDebugger?
+                rbs.GetOutputDependency().Complete();
+
+                NativeStream.Reader reader = nextResults.PixelData.AsReader();
+                for (int i = 0; i < nextResults.PixelData.ForEachCount; i++)
                 {
                     reader.BeginForEachIndex(i);
                     while (reader.RemainingItemCount > 0)
@@ -86,20 +98,13 @@ void Update()
                 }
 
                 blasterTexture.Apply();
-                lastResults.PixelData.Dispose();
-                ExpectingResults = false;
-            }
 
-            if (World.DefaultGameObjectInjectionWorld == null)
-            {
-                return;
+                // NOTE: If this logic is moved to the likes of LateUpdate there will be order issues
+                // with the RayTracerSystem.OnUpdate function as PixelData will be invalid.
+                nextResults.Dispose();
             }
 
-            RayTracerSystem rbs = World.DefaultGameObjectInjectionWorld.GetExistingSystem<RayTracerSystem>();
-            if (rbs == null || !rbs.IsEnabled)
-            {
-                return;
-            }
+            Vector3 imageCenter = transform.TransformPoint(new Vector3(0, 0, -ImagePlane));
 
             Vector3 lightDir = new Vector3(0, 0, -1);
             GameObject sceneLight = GameObject.Find("Directional Light");
@@ -111,7 +116,7 @@ void Update()
             Vector3 up = transform.rotation * new Vector3(0, 1, 0);
             Vector3 right = transform.rotation * new Vector3(1, 0, 0);
 
-            lastResults = rbs.AddRequest(new RayTracerSystem.RayRequest
+            nextResults = rbs.AddRequest(new RayTracerSystem.RayRequest
             {
                 PinHole = transform.position,
                 ImageCenter = imageCenter,
@@ -121,13 +126,12 @@ void Update()
                 RayLength = RayLength,
                 PlaneHalfExtents = planeHalfExtents,
                 AmbientLight = AmbientLight,
-                ImageResolution = ImageRes,
+                ImageResolution = imageRes,
                 AlternateKeys = AlternateKeys,
                 CastSphere = CastSphere,
                 Shadows = Shadows,
                 CollisionFilter = CollisionFilter.Default
             });
-            ExpectingResults = true;
         }
     }
 }

UnityPhysicsSamples/Assets/Common/Scripts/RayTracer/RayTracerSystem.cs

@@ -9,10 +9,14 @@
 
 namespace Unity.Physics.Extensions
 {
-    [UpdateInGroup(typeof(SimulationSystemGroup))]
+    [UpdateInGroup(typeof(FixedStepSimulationSystemGroup))]
+    [UpdateAfter(typeof(BuildPhysicsWorld))]
     public class RayTracerSystem : SystemBase
     {
         BuildPhysicsWorld m_BuildPhysicsWorldSystem;
+        JobHandle m_OutputDependency;
+
+        public JobHandle GetOutputDependency() => m_OutputDependency;
 
         public struct RayRequest
         {
@@ -34,6 +38,12 @@ public struct RayRequest
         public struct RayResult
         {
             public NativeStream PixelData;
+            public void Dispose()
+            {
+                PixelData.Dispose();
+                // setting default will reset PixelData.IsCreated
+                PixelData = default;
+            }
         }
 
         public RayResult AddRequest(RayRequest req)
@@ -206,9 +216,9 @@ protected override void OnUpdate()
                 return;
             }
 
-            var handle = JobHandle.CombineDependencies(Dependency, m_BuildPhysicsWorldSystem.GetOutputDependency());
+            Dependency = JobHandle.CombineDependencies(Dependency, m_BuildPhysicsWorldSystem.GetOutputDependency());
 
-            JobHandle combinedJobs = handle;
+            JobHandle combinedJobs = Dependency;
             for (int i = 0; i < m_Requests.Count; i++)
             {
                 JobHandle rcj = new RaycastJob
@@ -217,15 +227,18 @@ protected override void OnUpdate()
                     Request = m_Requests[0],
                     World = m_BuildPhysicsWorldSystem.PhysicsWorld.CollisionWorld,
                     NumDynamicBodies = m_BuildPhysicsWorldSystem.PhysicsWorld.NumDynamicBodies
-                }.Schedule(m_Results[0].PixelData.ForEachCount, 1, handle);
-                rcj.Complete(); //<todo.eoin How can we properly wait on this task when reading results?
+                }.Schedule(m_Results[0].PixelData.ForEachCount, 1, Dependency);
                 combinedJobs = JobHandle.CombineDependencies(combinedJobs, rcj);
             }
 
             m_Requests.Clear();
             m_Results.Clear();
 
             Dependency = combinedJobs;
+
+            m_OutputDependency = Dependency;
+            // Inform next system in the pipeline of its dependency
+            m_BuildPhysicsWorldSystem.AddInputDependencyToComplete(m_OutputDependency);
         }
     }
 }

UnityPhysicsSamples/Assets/Common/Scripts/SpawnRandomObjectsAuthoring.cs

@@ -73,9 +73,9 @@ internal virtual int GetRandomSeed(T spawnSettings)
         return seed;
     }
 
-    internal virtual void OnBeforeInstantiatePrefab(T spawnSettings) {}
+    internal virtual void OnBeforeInstantiatePrefab(ref T spawnSettings) {}
 
-    internal virtual void ConfigureInstance(Entity instance, T spawnSettings) {}
+    internal virtual void ConfigureInstance(Entity instance, ref T spawnSettings) {}
 
     protected override void OnUpdate()
     {
@@ -89,7 +89,7 @@ protected override void OnUpdate()
 
                 var count = spawnSettings.Count;
 
-                OnBeforeInstantiatePrefab(spawnSettings);
+                OnBeforeInstantiatePrefab(ref spawnSettings);
 
                 var instances = new NativeArray<Entity>(count, Allocator.Temp);
                 EntityManager.Instantiate(spawnSettings.Prefab, instances);
@@ -103,7 +103,7 @@ protected override void OnUpdate()
                     var instance = instances[i];
                     EntityManager.SetComponentData(instance, new Translation { Value = positions[i] });
                     EntityManager.SetComponentData(instance, new Rotation { Value = rotations[i] });
-                    ConfigureInstance(instance, spawnSettings);
+                    ConfigureInstance(instance, ref spawnSettings);
                 }
 
                 EntityManager.RemoveComponent<T>(entity);