[Dependencies] Update Jolt Physics;

Author: LittleCodingFox

Dependencies/JoltPhysicsSharp/JoltPhysics.Native.dll

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bc9bdcaee867d1570403edfaf3a82c4f82e2785f5a9361816990565857a05f5
+size 5120

Dependencies/JoltPhysicsSharp/JoltPhysicsSharp.dll

@@ -1 +1 @@
-550ad22e8ea379c0b64d6150c56342b4c37bb10a
+48d2f26d476f36d1140cba6ba269c70e54888214

Dependencies/JoltPhysicsSharp/commit.sha

@@ -282,7 +282,8 @@ private void OnContactRemoved(PhysicsSystem system, ref SubShapeIDPair subShapeP
         }
     }
 
-    private ValidateResult OnContactValidate(PhysicsSystem system, in Body body1, in Body body2, Double3 baseOffset, in CollideShapeResult collisionResult)
+    private ValidateResult OnContactValidate(PhysicsSystem system, in Body body1, in Body body2, RVector3 baseOffset,
+        in CollideShapeResult collisionResult)
     {
         lock (threadLock)
         {
@@ -699,7 +700,7 @@ public bool CreateHeightMap(Entity entity, float[] heights, Vector3 offset, Vect
             {
                 fixed(float *ptr = heights)
                 {
-                    return CreateBody(entity, new HeightFieldShapeSettings(ptr, offset, scale, (int)Math.Sqrt(heights.Length)),
+                    return CreateBody(entity, new HeightFieldShapeSettings(ptr, offset, scale, (uint)Math.Sqrt(heights.Length)),
                         position, rotation, MotionType.Static, layer, false, 0, friction, restitution, true, true, true, false,
                         mass, out body);
                 }
@@ -877,7 +878,7 @@ public IBody3D CreateBody(Entity entity, World world)
                 fixed(float *ptr = heightMap.heights)
                 {
                     compound.AddShape(heightMap.position, heightMap.rotation.SafeNormalize(),
-                        new HeightFieldShapeSettings(ptr, heightMap.offset, heightMap.scale, (int)Math.Sqrt(heightMap.heights.Length)));
+                        new HeightFieldShapeSettings(ptr, heightMap.offset, heightMap.scale, (uint)Math.Sqrt(heightMap.heights.Length)));
                 }
             }
         }

Engine/Staple.JoltPhysics/JoltPhysics/JoltPhysics3D.cs

@@ -58,7 +58,7 @@ public void Startup()
     {
         destroyed = false;
 
-        if(JoltPhysicsSharp.Foundation.Init() == false)
+        if(!JoltPhysicsSharp.Foundation.Init())
         {
             throw new InvalidOperationException("[JoltPhysics] Failed to initialize Foundation");
         }
@@ -282,7 +282,8 @@ private void OnContactRemoved(PhysicsSystem system, ref SubShapeIDPair subShapeP
         }
     }
 
-    private ValidateResult OnContactValidate(PhysicsSystem system, in Body body1, in Body body2, Double3 baseOffset, in CollideShapeResult collisionResult)
+    private ValidateResult OnContactValidate(PhysicsSystem system, in Body body1, in Body body2, RVector3 baseOffset,
+        in CollideShapeResult collisionResult)
     {
         lock (threadLock)
         {
@@ -291,7 +292,7 @@ private ValidateResult OnContactValidate(PhysicsSystem system, in Body body1, in
 
         if (TryFindBody(body1, out var b1) && TryFindBody(body2, out var b2))
         {
-            if(Physics3D.Instance.ContactValidate(b1, b2) == false)
+            if(!Physics3D.Instance.ContactValidate(b1, b2))
             {
                 lock (threadLock)
                 {
@@ -383,7 +384,7 @@ public void Update(float deltaTime)
                 {
                     var p = pair.Value;
 
-                    if (p.body.IsActive == false)
+                    if (!p.body.IsActive)
                     {
                         continue;
                     }
@@ -405,7 +406,7 @@ public void Update(float deltaTime)
                 {
                     var p = pair.Value;
 
-                    if(p.enabled == false)
+                    if(!p.enabled)
                     {
                         continue;
                     }
@@ -439,14 +440,14 @@ private void Simulate()
                     p.previousRotation = p.currentRotation;
                 }
 
-                if (p.entity.EnabledInHierarchy == false)
+                if (!p.entity.EnabledInHierarchy)
                 {
                     if (p.body.IsActive)
                     {
                         physicsSystem.BodyInterface.DeactivateBody(p.body.ID);
                     }
                 }
-                else if (p.body.IsActive == false)
+                else if (!p.body.IsActive)
                 {
                     physicsSystem.BodyInterface.ActivateBody(p.body.ID);
                 }
@@ -462,7 +463,7 @@ private void Simulate()
                     p.previousRotation = p.currentRotation;
                 }
 
-                if (p.entity.EnabledInHierarchy == false)
+                if (!p.entity.EnabledInHierarchy)
                 {
                     if (p.enabled)
                     {
@@ -471,7 +472,7 @@ private void Simulate()
                         p.character.RemoveFromPhysicsSystem();
                     }
                 }
-                else if (p.enabled == false)
+                else if (!p.enabled)
                 {
                     p.enabled = true;
 
@@ -490,15 +491,15 @@ private void Simulate()
             {
                 var p = pair.Value;
 
-                if (p.body.IsActive == false)
+                if (!p.body.IsActive)
                 {
                     continue;
                 }
 
                 p.currentPosition = p.body.Position;
                 p.currentRotation = p.body.Rotation;
 
-                if (Physics.InterpolatePhysics == false && p.transform != null)
+                if (!Physics.InterpolatePhysics && p.transform != null)
                 {
                     p.transform.Position = p.currentPosition;
                     p.transform.Rotation = p.currentRotation;
@@ -509,14 +510,14 @@ private void Simulate()
             {
                 var p = pair.Value;
 
-                if (p.enabled == false)
+                if (!p.enabled)
                 {
                     continue;
                 }
 
                 (p.currentPosition, p.currentRotation) = p.character.GetPositionAndRotation();
 
-                if (Physics.InterpolatePhysics == false && p.transform != null)
+                if (!Physics.InterpolatePhysics && p.transform != null)
                 {
                     p.transform.Position = p.currentPosition;
                     p.transform.Rotation = p.currentRotation;
@@ -594,22 +595,22 @@ private bool CreateBody(Entity entity, ShapeSettings settings, Vector3 position,
                 AllowedDOFs.TranslationY
             };
 
-            if (freezeX == false)
+            if (!freezeX)
             {
                 dofs.Add(AllowedDOFs.RotationX);
             }
 
-            if (freezeY == false)
+            if (!freezeY)
             {
                 dofs.Add(AllowedDOFs.RotationY);
             }
 
-            if (freezeZ == false)
+            if (!freezeZ)
             {
                 dofs.Add(AllowedDOFs.RotationZ);
             }
 
-            if (is2DPlane == false)
+            if (!is2DPlane)
             {
                 dofs.Add(AllowedDOFs.TranslationZ);
             }
@@ -699,7 +700,7 @@ public bool CreateHeightMap(Entity entity, float[] heights, Vector3 offset, Vect
             {
                 fixed(float *ptr = heights)
                 {
-                    return CreateBody(entity, new HeightFieldShapeSettings(ptr, offset, scale, (int)Math.Sqrt(heights.Length)),
+                    return CreateBody(entity, new HeightFieldShapeSettings(ptr, offset, scale, (uint)Math.Sqrt(heights.Length)),
                         position, rotation, MotionType.Static, layer, false, 0, friction, restitution, true, true, true, false,
                         mass, out body);
                 }
@@ -792,7 +793,7 @@ public bool CreateMesh(Entity entity, Mesh mesh, Vector3 position, Quaternion ro
             throw new NullReferenceException("Mesh is null");
         }
 
-        if(mesh.isReadable == false)
+        if(!mesh.isReadable)
         {
             throw new ArgumentException("Mesh is not readable", nameof(mesh));
         }
@@ -846,14 +847,14 @@ public IBody3D CreateBody(Entity entity, World world)
         RigidBody3D rigidBody = null;
         Character3D character = null;
 
-        if (world.TryGetComponent(entity, out rigidBody) == false && world.TryGetComponent(entity, out character) == false)
+        if (!world.TryGetComponent(entity, out rigidBody) && !world.TryGetComponent(entity, out character))
         {
             Log.Debug($"[Physics3D] Failed to create body for entity {world.GetEntityName(entity)}: No RigidBody3D or Character3D component found");
 
             return null;
         }
 
-        if (world.TryGetComponent<Transform>(entity, out var transform) == false)
+        if (!world.TryGetComponent<Transform>(entity, out var transform))
         {
             Log.Debug($"[Physics3D] Failed to create body for entity {world.GetEntityName(entity)}: No Transform component found");
 
@@ -877,7 +878,7 @@ public IBody3D CreateBody(Entity entity, World world)
                 fixed(float *ptr = heightMap.heights)
                 {
                     compound.AddShape(heightMap.position, heightMap.rotation.SafeNormalize(),
-                        new HeightFieldShapeSettings(ptr, heightMap.offset, heightMap.scale, (int)Math.Sqrt(heightMap.heights.Length)));
+                        new HeightFieldShapeSettings(ptr, heightMap.offset, heightMap.scale, (uint)Math.Sqrt(heightMap.heights.Length)));
                 }
             }
         }
@@ -971,7 +972,7 @@ public IBody3D CreateBody(Entity entity, World world)
                 throw new NullReferenceException($"MeshCollider3D {world.GetEntityName(entity)} Mesh is null");
             }
 
-            if (mesh.isReadable == false)
+            if (!mesh.isReadable)
             {
                 throw new ArgumentException($"MeshCollider3D {world.GetEntityName(entity)} Mesh is not readable", nameof(mesh));
             }
@@ -1008,7 +1009,7 @@ public IBody3D CreateBody(Entity entity, World world)
             compound.AddShape(meshCollider.position, meshCollider.rotation.SafeNormalize(), settings);
         }
 
-        if(any == false)
+        if(!any)
         {
             Log.Error($"[Physics3D] Rigid Body for entity {world.GetEntityName(entity)} has no attached colliders, ignoring...");
 

Staging/Packages/com.staple.joltphysics/JoltPhysics/JoltPhysics3D.cs

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bc9bdcaee867d1570403edfaf3a82c4f82e2785f5a9361816990565857a05f5
+size 5120

Staging/Packages/com.staple.joltphysics/JoltPhysicsSharp/JoltPhysics.Native.dll

@@ -0,0 +1,7 @@
+{
+  "guid": "1b87a08b-8db1-4c39-b8d5-ae74d7e3d9e8",
+  "autoReferenced": false,
+  "anyPlatform": true,
+  "platforms": [],
+  "typeName": "Staple.Editor.PluginAsset"
+}

Staging/Packages/com.staple.joltphysics/JoltPhysicsSharp/JoltPhysics.Native.dll.meta

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83e60919e0cfa94e3305b94a8db605bac8f16c1c18ef583d1f84e807970302a5
-size 408576
+oid sha256:4464ca484e4c8d847375c13a579f3dd96d4f1bb47c9a25efa85ccd09db17ae66
+size 442880

Staging/Packages/com.staple.joltphysics/JoltPhysicsSharp/JoltPhysicsSharp.dll

@@ -1 +1 @@
-550ad22e8ea379c0b64d6150c56342b4c37bb10a
+48d2f26d476f36d1140cba6ba269c70e54888214