Add JBox.FullyContains

notgiven688 · Dec 18, 2024 · f9f5453 · f9f5453
1 parent 85be7dd
commit f9f5453
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Jitter2/Collision/DynamicTree.cs b/src/Jitter2/Collision/DynamicTree.cs
@@ -623,8 +623,7 @@ private void ScanForMovedProxies(Parallel.Batch batch)
 
             ref var node = ref Nodes[proxy.NodePtr];
 
-            if (node.ForceUpdate || node.ExpandedBox.Contains(proxy.WorldBoundingBox) !=
-                JBBox.ContainmentType.Contains)
+            if (node.ForceUpdate || !node.ExpandedBox.FullyContains(proxy.WorldBoundingBox))
             {
                 node.ForceUpdate = false;
                 list.Add(proxy);
@@ -811,7 +810,7 @@ private void InsertLeaf(int node, int where)
 
         while (where != root)
         {
-            if (Nodes[where].ExpandedBox.Contains(nodeBox) == JBBox.ContainmentType.Contains)
+            if (Nodes[where].ExpandedBox.FullyContains(nodeBox))
             {
                 break;
             }

diff --git a/src/Jitter2/LinearMath/JBBox.cs b/src/Jitter2/LinearMath/JBBox.cs
@@ -233,6 +233,13 @@ public readonly bool Disjoint(in JBBox box)
                  Max.Z >= box.Min.Z && Min.Z <= box.Max.Z);
     }
 
+    public readonly bool FullyContains(in JBBox box)
+    {
+        return Min.X <= box.Min.X && Max.X >= box.Max.X &&
+               Min.Y <= box.Min.Y && Max.Y >= box.Max.Y &&
+               Min.Z <= box.Min.Z && Max.Z >= box.Max.Z;
+    }
+
     public static JBBox CreateMerged(in JBBox original, in JBBox additional)
     {
         CreateMerged(original, additional, out JBBox result);