- Return back boundary pool for tree

- fix segment boundary borders to use epsilon (avoid lost items)
DrA1ex · Oct 7, 2023 · 8e1579a · 8e1579a
1 parent 2c2c300
commit 8e1579a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/lib/physics/common/tree.js b/lib/physics/common/tree.js
@@ -1,7 +1,11 @@
 import {BoundaryBox} from "./boundary.js";
+import {ObjectStack} from "../../misc/stack.js";
 
 const EPSILON = 1e-9;
 
+/** @type{ObjectStack<BoundaryBox>} */
+const BoundaryBoxPool = new ObjectStack(() => BoundaryBox.empty());
+
 class SpatialLeaf {
     /** @type{SpatialLeaf[]} */
     leafs = [];
@@ -37,6 +41,7 @@ class SpatialLeaf {
 
 export class SpatialTree {
     #leafId = 0;
+    #savedStackPosition;
 
     /** @type {SpatialLeaf} */
     root = null;
@@ -52,14 +57,23 @@ export class SpatialTree {
         this.divider = divider;
         this.maxCount = maxCount;
 
-        const boundary = BoundaryBox.fromBodies(items);
+        this.#savedStackPosition = BoundaryBoxPool.save();
+
+        const boundary = BoundaryBox.fromBodies(items, BoundaryBoxPool);
         const segmentBoundary = this.#createLevelBoundary(boundary);
 
-        this.root = new SpatialLeaf(this.#leafId++, items, BoundaryBox.fromBodies(items), segmentBoundary, true);
+        this.root = new SpatialLeaf(this.#leafId++, items, boundary, segmentBoundary, true);
 
         this.#fillLeaf(this.root);
     }
 
+    free() {
+        if (this.#savedStackPosition === null) return;
+
+        BoundaryBoxPool.restore(this.#savedStackPosition);
+        this.#savedStackPosition = null;
+    }
+
     #fillLeaf(leaf) {
         if (leaf.items.length <= this.maxCount) return;
 
@@ -78,7 +92,7 @@ export class SpatialTree {
         const filteredItems = items.filter(b => !b.static && SpatialTree.#isContainedByBoundary(b, segmentBoundary));
         if (filteredItems.length <= 0) return null;
 
-        const boundaryBox = BoundaryBox.fromBodies(filteredItems);
+        const boundaryBox = BoundaryBox.fromBodies(filteredItems, BoundaryBoxPool);
         const containsActive = parent.containsActive && filteredItems.some(b => b.active);
 
         return new SpatialLeaf(this.#leafId++, filteredItems, boundaryBox, segmentBoundary, containsActive);
@@ -89,11 +103,14 @@ export class SpatialTree {
         if (step <= EPSILON) return;
 
         for (let i = 0; i < this.divider; i++) {
+            const left = segmentBoundary.left + i * step
+            const right = (i < this.divider - 1 ? left + step : segmentBoundary.right + EPSILON);
+
             for (let j = 0; j < this.divider; j++) {
-                const left = segmentBoundary.left + i * step;
-                const top = segmentBoundary.top + j * step
+                const top = segmentBoundary.top + j * step;
+                const bottom = (j < this.divider - 1 ? top + step : segmentBoundary.bottom + EPSILON);
 
-                yield new BoundaryBox(left, left + step, top, top + step);
+                yield BoundaryBoxPool.get().update(left, right, top, bottom);
             }
         }
     }

diff --git a/lib/physics/solver.js b/lib/physics/solver.js
@@ -171,6 +171,7 @@ export class ImpulseBasedSolver {
     #collectCollisions() {
         let t = performance.now();
 
+        this.stepInfo.tree?.free();
         this.stepInfo.tree = new SpatialTree(this.rigidBodies, this.treeDivider, this.treeMaxCount);
         this.stepInfo.treeTime = performance.now() - t;