Merge branch 'development'

ProwlEngine · Jan 26, 2025 · 76a6169 · 76a6169
2 parents 355df51 + fd50afe
commit 76a6169
Show file tree

Hide file tree

Showing 16 changed files with 520 additions and 61 deletions.
diff --git a/Prowl.Editor/Program.cs b/Prowl.Editor/Program.cs
@@ -167,6 +167,9 @@ private static int Run(CliOpenOptions options)
 
         Application.Quitting += () =>
         {
+            if (PlayMode.Current == PlayMode.Mode.Playing)
+                PlayMode.Stop();
+
             if (Project.HasProject)
                 Project.Active.SaveTempScene();
         };
@@ -178,7 +181,7 @@ private static int Run(CliOpenOptions options)
 
     public static void CheckReloadingAssemblies()
     {
-        if (IsReloadingExternalAssemblies && Screen.IsFocused)
+        if (IsReloadingExternalAssemblies && Screen.IsFocused && PlayMode.Current == PlayMode.Mode.Editing)
         {
             IsReloadingExternalAssemblies = false;
 

diff --git a/Prowl.Runtime/Components/Physics/Colliders/BoxCollider.cs b/Prowl.Runtime/Components/Physics/Colliders/BoxCollider.cs
@@ -26,5 +26,5 @@ public Vector3 Size
         }
     }
 
-    public override RigidBodyShape[] CreateShapes() => [new BoxShape(size.x, size.y, size.z)];
+    public override RigidBodyShape[] CreateShapes() => [new BoxShape(MathD.Max(size.x, 0.01), MathD.Max(size.y, 0.01), MathD.Max(size.z, 0.01))];
 }
diff --git a/Prowl.Runtime/Components/Physics/Colliders/CapsuleCollider.cs b/Prowl.Runtime/Components/Physics/Colliders/CapsuleCollider.cs
@@ -34,5 +34,5 @@ public float Height
         }
     }
 
-    public override RigidBodyShape[] CreateShapes() => [new CapsuleShape(radius, height)];
+    public override RigidBodyShape[] CreateShapes() => [new CapsuleShape(MathD.Max(radius, 0.01), MathD.Max(height, 0.01))];
 }
diff --git a/Prowl.Runtime/Components/Physics/Colliders/Collider.cs b/Prowl.Runtime/Components/Physics/Colliders/Collider.cs
@@ -41,6 +41,8 @@ public RigidBodyShape[] CreateTransformedShapes()
             current = current.parent;
         }
 
+        cumulativeScale = Vector3.Max(cumulativeScale, Vector3.one * 0.05);
+
         // Get the local rotation and position in world space
         Quaternion localRotation = Quaternion.Euler(rotation);
         Vector3 scaledCenter = Vector3.Scale(this.center, cumulativeScale);

diff --git a/Prowl.Runtime/Components/Physics/Colliders/ConeCollider.cs b/Prowl.Runtime/Components/Physics/Colliders/ConeCollider.cs
@@ -34,5 +34,5 @@ public float Height
         }
     }
 
-    public override RigidBodyShape[] CreateShapes() => [new ConeShape(radius, height)];
+    public override RigidBodyShape[] CreateShapes() => [new ConeShape(MathD.Max(radius, 0.01), MathD.Max(height, 0.01))];
 }
diff --git a/Prowl.Runtime/Components/Physics/Colliders/CylinderCollider.cs b/Prowl.Runtime/Components/Physics/Colliders/CylinderCollider.cs
@@ -34,5 +34,5 @@ public float Height
         }
     }
 
-    public override RigidBodyShape[] CreateShapes() => [new CylinderShape(radius, height)];
+    public override RigidBodyShape[] CreateShapes() => [new CylinderShape(MathD.Max(radius, 0.01), MathD.Max(height, 0.01))];
 }
diff --git a/Prowl.Runtime/Components/Physics/Colliders/SphereCollider.cs b/Prowl.Runtime/Components/Physics/Colliders/SphereCollider.cs
@@ -23,5 +23,5 @@ public float Radius
         }
     }
 
-    public override RigidBodyShape[] CreateShapes() => [new SphereShape(radius)];
+    public override RigidBodyShape[] CreateShapes() => [new SphereShape(MathD.Max(radius, 0.01))];
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,5 +26,5 @@ public Vector3 Size @@
             }
         }
-        public override RigidBodyShape[] CreateShapes() => [new BoxShape(size.x, size.y, size.z)];
+        public override RigidBodyShape[] CreateShapes() => [new BoxShape(MathD.Max(size.x, 0.01), MathD.Max(size.y, 0.01), MathD.Max(size.z, 0.01))];
     }