Prevent inactive-inactive collision reports (#179)

notgiven688 · Sep 12, 2024 · 923e48c · 923e48c
1 parent 1c2aca9
commit 923e48c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Jitter2/Collision/PairHashSet.cs b/src/Jitter2/Collision/PairHashSet.cs
@@ -164,7 +164,7 @@ public PairHashSet()
     private void Resize(int size)
     {
         if (Slots.Length == size) return;
-        Trace.WriteLine($"RESIZING PAIRHASHSET, {Slots.Length} -> {size}");
+        Trace.WriteLine($"PairHashSet: Resizing {Slots.Length} -> {size}");
 
         var tmp = Slots;
         Count = 0;

diff --git a/src/Jitter2/SoftBodies/BroadPhaseCollisionFilter.cs b/src/Jitter2/SoftBodies/BroadPhaseCollisionFilter.cs
@@ -48,6 +48,8 @@ public bool Filter(IDynamicTreeProxy proxyA, IDynamicTreeProxy proxyB)
                 (i1, i2) = (i2, i1);
             }
 
+            if (!i1.SoftBody.IsActive && !i2.SoftBody.IsActive) return false;
+
             bool colliding = NarrowPhase.MPREPA(i1, i2,
                 JQuaternion.Identity, JVector.Zero,
                 out JVector pA, out JVector pB, out JVector normal, out float penetration);
@@ -66,6 +68,9 @@ public bool Filter(IDynamicTreeProxy proxyA, IDynamicTreeProxy proxyB)
         if (i1 != null)
         {
             var rb = (proxyB as RigidBodyShape)!.RigidBody!;
+
+            if (!i1.SoftBody.IsActive && !rb.Data.IsActive) return false;
+
             bool colliding = NarrowPhase.MPREPA(i1, (proxyB as RigidBodyShape)!, rb.Orientation, rb.Position,
                 out JVector pA, out JVector pB, out JVector normal, out float penetration);
 
@@ -83,6 +88,8 @@ public bool Filter(IDynamicTreeProxy proxyA, IDynamicTreeProxy proxyB)
         {
             var ra = (proxyA as RigidBodyShape)!.RigidBody!;
 
+            if (!i2.SoftBody.IsActive && !ra.Data.IsActive) return false;
+
             bool colliding = NarrowPhase.MPREPA(i2, (proxyA as RigidBodyShape)!, ra.Orientation, ra.Position,
                 out JVector pA, out JVector pB, out JVector normal, out float penetration);