Update UnityPhysicsSamples

Compatible with Unity Physics 0.5.1-preview.2

Author: CookieSalad

UnityPhysicsSamples/Assets/Common/Scripts/CameraSmoothTrack.cs

@@ -85,8 +85,7 @@ protected override void OnUpdate()
 
         PhysicsWorld world = m_BuildPhysicsWorld.PhysicsWorld;
 
-        var timestep = (float)m_RecordMostRecentFixedTime.MostRecentDeltaTime;
-        var timeAhead = Time.DeltaTime / timestep;
+        var timeAhead = (float)(Time.ElapsedTime - m_RecordMostRecentFixedTime.MostRecentElapsedTime);
 
         Entities
             .WithName("SmoothlyTrackCameraTargetsJob")

UnityPhysicsSamples/Assets/Common/Scripts/InitializeSamples.cs

@@ -0,0 +1,21 @@
+using Unity.Entities;
+using UnityEngine;
+
+// This class sets the upper limit of FPS of a demo that is being run.
+// It is used as a workaround for JobTempAlloc issues on CI and to make
+// measuring performance easier.
+public class InitializeSamplesSystem : SystemBase
+{
+    protected override void OnCreate()
+    {
+        // Currently, JobTempAlloc is raised also when a job takes more than 4 frames to complete, independent of allocation.
+        // Setting the target frame rate to 60 means giving each frame more time to complete, therefore the jobs would complete in less than 4 frames.
+        // Also, since FPS will be lower, there will be more frames with physics in them making perf measurements easier.
+        Application.targetFrameRate = 60;
+
+        // Disabling updates because the system has nothing to do in OnUpdate method
+        Enabled = false;
+    }
+
+    protected override void OnUpdate() {}
+}

…ets/Tests/JointTest/AngLimitDemo.cs.meta …Common/Scripts/InitializeSamples.cs.metaUnityPhysicsSamples/Assets/Tests/JointTest/AngLimitDemo.cs.meta renamed to UnityPhysicsSamples/Assets/Common/Scripts/InitializeSamples.cs.meta UnityPhysicsSamples/Assets/Tests/JointTest/AngLimitDemo.cs.meta renamed to UnityPhysicsSamples/Assets/Common/Scripts/InitializeSamples.cs.meta

@@ -1,5 +1,6 @@
 using Unity.Collections;
 using Unity.Entities;
+using Unity.Physics.Systems;
 using UnityEngine;
 
 public struct LifeTime : IComponentData
@@ -16,6 +17,8 @@ public void Convert(Entity entity, EntityManager dstManager, GameObjectConversio
         dstManager.AddComponentData(entity, new LifeTime { Value = Value });
 }
 
+[UpdateInGroup(typeof(FixedStepSimulationSystemGroup))]
+[UpdateBefore(typeof(BuildPhysicsWorld))]
 public class LifeTimeSystem : SystemBase
 {
     protected override void OnUpdate()

UnityPhysicsSamples/Assets/Common/Scripts/LifeTimeAuthoring.cs

@@ -42,8 +42,11 @@ public void Convert(Entity entity, EntityManager dstManager, GameObjectConversio
 [UpdateBefore(typeof(BuildPhysicsWorld))]
 public class RandomMotionSystem : SystemBase
 {
+    private BuildPhysicsWorld m_BuildPhysicsWorld;
+
     protected override void OnCreate()
     {
+        m_BuildPhysicsWorld = World.GetExistingSystem<BuildPhysicsWorld>();
         RequireForUpdate(GetEntityQuery(new EntityQueryDesc
         {
             All = new ComponentType[]
@@ -85,5 +88,6 @@ protected override void OnUpdate()
                     velocity.Linear -= stepComponent.Gravity * deltaTime;
                 }
             }).Schedule();
+        m_BuildPhysicsWorld.AddInputDependency(Dependency);
     }
 }

UnityPhysicsSamples/Assets/Common/Scripts/RandomMotionAuthoring.cs

@@ -90,12 +90,12 @@ void Update()
                 ExpectingResults = false;
             }
 
-            if (BasePhysicsDemo.DefaultWorld == null)
+            if (World.DefaultGameObjectInjectionWorld == null)
             {
                 return;
             }
 
-            RayTracerSystem rbs = BasePhysicsDemo.DefaultWorld.GetExistingSystem<RayTracerSystem>();
+            RayTracerSystem rbs = World.DefaultGameObjectInjectionWorld.GetExistingSystem<RayTracerSystem>();
             if (rbs == null || !rbs.IsEnabled)
             {
                 return;

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

@@ -185,6 +185,9 @@ public unsafe void Execute(int index)
                     }
                 }
 
+                if (sphere.IsCreated)
+                    sphere.Dispose();
+
                 Results.EndForEachIndex();
             }
         }

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

@@ -2,81 +2,100 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
+using Unity.Collections;
 using Unity.Entities;
 using Unity.Mathematics;
 using Unity.Physics;
-using Unity.Physics.Authoring;
-using Unity.Physics.Extensions;
-using Unity.Physics.Systems;
 using Unity.Rendering;
 using Unity.Transforms;
 using UnityEngine;
 using Collider = Unity.Physics.Collider;
 using Material = UnityEngine.Material;
 using Mesh = UnityEngine.Mesh;
 
-/// <summary>
-/// Helper for demos set up in C# rather than in the editor
-/// </summary>
-public class BasePhysicsDemo : MonoBehaviour
+public abstract class SceneCreationSettings : IComponentData
 {
-    public static World DefaultWorld => World.DefaultGameObjectInjectionWorld;
+    public Material DynamicMaterial;
+    public Material StaticMaterial;
+}
 
-    public static void ResetDefaultWorld()
-    {
-        DefaultWorld.EntityManager.CompleteAllJobs();
-        foreach (var system in DefaultWorld.Systems)
-        {
-            system.Enabled = false;
-        }
+public class SceneCreatedTag : IComponentData {};
 
-        DefaultWorld.Dispose();
-        DefaultWorldInitialization.Initialize("Default World", false);
-    }
 
-    public Material dynamicMaterial;
-    public Material staticMaterial;
+// Base class of authoring components that create scene from code, using SceneCreationSystem
+public abstract class SceneCreationAuthoring<T> : MonoBehaviour, IConvertGameObjectToEntity
+    where T : SceneCreationSettings, new()
+{
+    public Material DynamicMaterial;
+    public Material StaticMaterial;
 
-    protected void init()
+    public virtual void Convert(Entity entity, EntityManager dstManager, GameObjectConversionSystem conversionSystem)
     {
-        // Load assets
-        //dynamicMaterial = (Material)Resources.Load("Materials/PhysicsDynamicMaterial");
-        //staticMaterial = (Material)Resources.Load("Materials/PhysicsStaticMaterial");
+        T sceneSettings = new T
+        {
+            DynamicMaterial = DynamicMaterial,
+            StaticMaterial = StaticMaterial
+        };
+        dstManager.AddComponentData(entity, sceneSettings);
     }
+}
+
+[UpdateInGroup(typeof(InitializationSystemGroup))]
+public abstract class SceneCreationSystem<T> : SystemBase
+    where T : SceneCreationSettings
+{
+    private EntityQuery m_ScenesToCreateQuery;
+
+    protected Material DynamicMaterial;
+    protected Material StaticMaterial;
+
+    public NativeList<BlobAssetReference<Collider>> CreatedColliders;
 
-#if !UNITY_EDITOR
-    void OnEnable()
+    protected override void OnCreate()
     {
-        Application.logMessageReceivedThreaded += HandleLogEntry;
+        CreatedColliders = new NativeList<BlobAssetReference<Collider>>(Allocator.Persistent);
+
+        m_ScenesToCreateQuery = GetEntityQuery(new EntityQueryDesc
+        {
+            All = new ComponentType[] { typeof(T) },
+            None = new ComponentType[] { typeof(SceneCreatedTag) },
+        });
+        RequireForUpdate(GetEntityQuery(new ComponentType[] { typeof(T) }));
     }
 
-    void HandleLogEntry(string logEntry, string stackTrace, LogType logType)
+    protected override void OnUpdate()
     {
-        if (logType == LogType.Exception)
+        if (m_ScenesToCreateQuery.CalculateEntityCount() == 0) return;
+
+        using (var entities = m_ScenesToCreateQuery.ToEntityArray(Allocator.TempJob))
         {
-            // Log exception and exit with non-zero error code
-            UnityEngine.Debug.Log($"Caught an exception, exiting... \n {logEntry} \n {stackTrace}");
-            Application.Quit(1);
+            foreach (Entity entity in entities)
+            {
+                T settings = EntityManager.GetComponentObject<T>(entity);
+                DynamicMaterial = settings.DynamicMaterial;
+                StaticMaterial = settings.StaticMaterial;
+
+                CreateScene(settings);
+                EntityManager.AddComponentData(entity, new SceneCreatedTag());
+            }
         }
     }
 
-    void OnDisable()
+    protected override void OnDestroy()
     {
-        Application.logMessageReceivedThreaded -= HandleLogEntry;
-    }
-
-#endif
+        foreach (var collider in CreatedColliders)
+        {
+            if (collider.IsCreated)
+                collider.Dispose();
+        }
 
-    protected virtual void Start()
-    {
-        init();
+        CreatedColliders.Dispose();
     }
 
-    //
-    // Object creation
-    //
+    public abstract void CreateScene(T sceneSettings);
+
+    #region Utilities
 
-    // TODO: add proper utility APIs for converting Collider into buffers usable for UnityEngine.Mesh and for drawing lines
     static readonly Type k_DrawComponent = typeof(Unity.Physics.Authoring.DisplayBodyColliders)
         .GetNestedType("DrawComponent", BindingFlags.NonPublic);
 
@@ -88,7 +107,7 @@ protected virtual void Start()
     static readonly FieldInfo k_DisplayResultsMesh = k_DisplayResult.GetField("Mesh");
     static readonly PropertyInfo k_DisplayResultsTransform = k_DisplayResult.GetProperty("Transform");
 
-    internal static void CreateRenderMeshForCollider(
+    public static void CreateRenderMeshForCollider(
         EntityManager entityManager, Entity entity, BlobAssetReference<Collider> collider, Material material
     )
     {
@@ -117,10 +136,10 @@ internal static void CreateRenderMeshForCollider(
         entityManager.AddComponentData(entity, new RenderBounds { Value = mesh.bounds.ToAABB() });
     }
 
-    Entity CreateBody(float3 position, quaternion orientation, BlobAssetReference<Collider> collider,
+    public Entity CreateBody(float3 position, quaternion orientation, BlobAssetReference<Collider> collider,
         float3 linearVelocity, float3 angularVelocity, float mass, bool isDynamic)
     {
-        var entityManager = DefaultWorld.EntityManager;
+        var entityManager = World.DefaultGameObjectInjectionWorld.EntityManager;
 
         Entity entity = entityManager.CreateEntity(new ComponentType[] {});
 
@@ -131,7 +150,7 @@ Entity CreateBody(float3 position, quaternion orientation, BlobAssetReference<Co
         var colliderComponent = new PhysicsCollider { Value = collider };
         entityManager.AddComponentData(entity, colliderComponent);
 
-        CreateRenderMeshForCollider(entityManager, entity, collider, isDynamic ? dynamicMaterial : staticMaterial);
+        CreateRenderMeshForCollider(entityManager, entity, collider, isDynamic ? DynamicMaterial : StaticMaterial);
 
         if (isDynamic)
         {
@@ -153,20 +172,20 @@ Entity CreateBody(float3 position, quaternion orientation, BlobAssetReference<Co
         return entity;
     }
 
-    protected Entity CreateStaticBody(float3 position, quaternion orientation, BlobAssetReference<Collider> collider)
+    public Entity CreateStaticBody(float3 position, quaternion orientation, BlobAssetReference<Collider> collider)
     {
         return CreateBody(position, orientation, collider, float3.zero, float3.zero, 0.0f, false);
     }
 
-    protected Entity CreateDynamicBody(float3 position, quaternion orientation, BlobAssetReference<Collider> collider,
+    public Entity CreateDynamicBody(float3 position, quaternion orientation, BlobAssetReference<Collider> collider,
         float3 linearVelocity, float3 angularVelocity, float mass)
     {
         return CreateBody(position, orientation, collider, linearVelocity, angularVelocity, mass, true);
     }
 
-    protected Entity CreateJoint(PhysicsJoint joint, Entity entityA, Entity entityB, bool enableCollision = false)
+    public Entity CreateJoint(PhysicsJoint joint, Entity entityA, Entity entityB, bool enableCollision = false)
     {
-        var entityManager = DefaultWorld.EntityManager;
+        var entityManager = World.DefaultGameObjectInjectionWorld.EntityManager;
         ComponentType[] componentTypes =
         {
             typeof(PhysicsConstrainedBodyPair),
@@ -180,11 +199,13 @@ protected Entity CreateJoint(PhysicsJoint joint, Entity entityA, Entity entityB,
         return jointEntity;
     }
 
-    protected RigidTransform GetBodyTransform(Entity entity)
+    public static RigidTransform GetBodyTransform(Entity entity)
     {
-        var entityManager = DefaultWorld.EntityManager;
+        var entityManager = World.DefaultGameObjectInjectionWorld.EntityManager;
         return new RigidTransform(
             entityManager.GetComponentData<Rotation>(entity).Value,
             entityManager.GetComponentData<Translation>(entity).Value);
     }
+
+    #endregion
 }

…Assets/Common/Scripts/BasePhysicsDemo.cs …ts/Common/Scripts/SceneCreationSystem.csUnityPhysicsSamples/Assets/Common/Scripts/BasePhysicsDemo.cs renamed to UnityPhysicsSamples/Assets/Common/Scripts/SceneCreationSystem.cs UnityPhysicsSamples/Assets/Common/Scripts/BasePhysicsDemo.cs renamed to UnityPhysicsSamples/Assets/Common/Scripts/SceneCreationSystem.cs

@@ -2,6 +2,7 @@
 using Unity.Collections;
 using Unity.Entities;
 using Unity.Mathematics;
+using Unity.Physics.Systems;
 using Unity.Transforms;
 using UnityEngine;
 
@@ -59,6 +60,8 @@ class SpawnRandomObjectsSystem : SpawnRandomObjectsSystemBase<SpawnSettings>
 {
 }
 
+[UpdateInGroup(typeof(FixedStepSimulationSystemGroup))]
+[UpdateBefore(typeof(BuildPhysicsWorld))]
 abstract class SpawnRandomObjectsSystemBase<T> : SystemBase where T : struct, IComponentData, ISpawnSettings
 {
     internal virtual int GetRandomSeed(T spawnSettings)