un-exposing internal code. See #16

Lusito · Dec 30, 2020 · 8e3e6c7 · 8e3e6c7
1 parent 3985ef4
commit 8e3e6c7
Show file tree

Hide file tree

Showing 38 changed files with 612 additions and 501 deletions.
diff --git a/packages/controllers/src/controller/b2_buoyancy_controller.ts b/packages/controllers/src/controller/b2_buoyancy_controller.ts
@@ -95,7 +95,7 @@ export class b2BuoyancyController extends b2Controller {
             const massc = new b2Vec2();
             let area = 0;
             let mass = 0;
-            for (let fixture = body.GetFixtureList(); fixture; fixture = fixture.m_next) {
+            for (let fixture = body.GetFixtureList(); fixture; fixture = fixture.GetNext()) {
                 const sc = new b2Vec2();
                 const sarea = b2SubmergedAreaForShape(
                     fixture.GetShape(),

diff --git a/packages/controllers/src/dynamics/b2_world.ts b/packages/controllers/src/dynamics/b2_world.ts
@@ -87,7 +87,9 @@ b2_augment(b2World.prototype, {
         }
         original(body);
     },
-    Solve(this: b2World, original, step) {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    Solve(this: b2World, original: (step: b2TimeStep) => void, step: b2TimeStep) {
         for (let controller = this.m_controllerList; controller; controller = controller.m_next) {
             controller.Step(step);
         }

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -26,12 +26,13 @@
     "dist"
   ],
   "scripts": {
-    "build": "rimraf dist && tsc"
+    "build": "rimraf dist && tsc && idtsc"
   },
   "browserslist": [
     "> 5%"
   ],
   "devDependencies": {
+    "idtsc": "^0.9.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.0.2"
   },

diff --git a/packages/core/src/collision/b2_broad_phase.ts b/packages/core/src/collision/b2_broad_phase.ts
@@ -29,7 +29,7 @@ type b2Pair<T> = [b2TreeNode<T>, b2TreeNode<T>];
  * It is up to the client to consume the new pairs and to track subsequent overlap.
  */
 export class b2BroadPhase<T> {
-    public readonly m_tree = new b2DynamicTree<T>();
+    private readonly m_tree = new b2DynamicTree<T>();
 
     private m_proxyCount = 0;
 
@@ -204,12 +204,12 @@ export class b2BroadPhase<T> {
         this.m_tree.ShiftOrigin(newOrigin);
     }
 
-    public BufferMove(proxy: b2TreeNode<T>): void {
+    private BufferMove(proxy: b2TreeNode<T>): void {
         this.m_moveBuffer[this.m_moveCount] = proxy;
         ++this.m_moveCount;
     }
 
-    public UnBufferMove(proxy: b2TreeNode<T>): void {
+    private UnBufferMove(proxy: b2TreeNode<T>): void {
         const i = this.m_moveBuffer.indexOf(proxy);
         this.m_moveBuffer[i] = null;
     }

diff --git a/packages/core/src/collision/b2_dynamic_tree.ts b/packages/core/src/collision/b2_dynamic_tree.ts
@@ -124,11 +124,9 @@ export class b2TreeNode<T> {
  * Nodes are pooled
  */
 export class b2DynamicTree<T> {
-    public m_root: b2TreeNode<T> | null = null;
+    private m_root: b2TreeNode<T> | null = null;
 
-    public m_freeList: b2TreeNode<T> | null = null;
-
-    public m_insertionCount = 0;
+    private m_freeList: b2TreeNode<T> | null = null;
 
     public Query(aabb: b2AABB, callback: (node: b2TreeNode<T>) => boolean): void {
         const stack = temp.stack as Array<b2TreeNode<T> | null>;
@@ -240,7 +238,7 @@ export class b2DynamicTree<T> {
         }
     }
 
-    public AllocateNode(): b2TreeNode<T> {
+    private AllocateNode(): b2TreeNode<T> {
         // Expand the node pool as needed.
         if (this.m_freeList === null) {
             return new b2TreeNode<T>();
@@ -256,7 +254,7 @@ export class b2DynamicTree<T> {
         return node;
     }
 
-    public FreeNode(node: b2TreeNode<T>): void {
+    private FreeNode(node: b2TreeNode<T>): void {
         node.parent = this.m_freeList;
         node.Reset();
         this.m_freeList = node;
@@ -339,9 +337,7 @@ export class b2DynamicTree<T> {
         return true;
     }
 
-    public InsertLeaf(leaf: b2TreeNode<T>): void {
-        ++this.m_insertionCount;
-
+    private InsertLeaf(leaf: b2TreeNode<T>): void {
         if (this.m_root === null) {
             this.m_root = leaf;
             this.m_root.parent = null;
@@ -452,7 +448,7 @@ export class b2DynamicTree<T> {
         // this.Validate();
     }
 
-    public RemoveLeaf(leaf: b2TreeNode<T>): void {
+    private RemoveLeaf(leaf: b2TreeNode<T>): void {
         if (leaf === this.m_root) {
             this.m_root = null;
             return;
@@ -494,7 +490,7 @@ export class b2DynamicTree<T> {
         // this.Validate();
     }
 
-    public Balance(A: b2TreeNode<T>): b2TreeNode<T> {
+    private Balance(A: b2TreeNode<T>): b2TreeNode<T> {
         // DEBUG: b2Assert(A !== null);
 
         if (A.IsLeaf() || A.height < 2) {
@@ -622,162 +618,13 @@ export class b2DynamicTree<T> {
         return totalArea / rootArea;
     }
 
-    public ComputeHeight(): number {
-        if (this.m_root === null) {
-            return 0;
-        }
-        const height = this.m_root.ComputeHeight();
-        return height;
-    }
-
-    public ValidateStructure(node: b2TreeNode<T> | null): void {
-        if (node === null) {
-            return;
-        }
-
-        if (node === this.m_root) {
-            // DEBUG: b2Assert(node.parent === null);
-        }
-
-        if (node.IsLeaf()) {
-            // DEBUG: b2Assert(node.child1 === null);
-            // DEBUG: b2Assert(node.child2 === null);
-            // DEBUG: b2Assert(node.height === 0);
-            return;
-        }
-
-        const child1 = b2Verify(node.child1);
-        const child2 = b2Verify(node.child2);
-
-        // DEBUG: b2Assert(child1.parent === node);
-        // DEBUG: b2Assert(child2.parent === node);
-
-        this.ValidateStructure(child1);
-        this.ValidateStructure(child2);
-    }
-
-    public ValidateMetrics(node: b2TreeNode<T> | null): void {
-        if (node === null) {
-            return;
-        }
-
-        if (node.IsLeaf()) {
-            // DEBUG: b2Assert(node.child1 === null);
-            // DEBUG: b2Assert(node.child2 === null);
-            // DEBUG: b2Assert(node.height === 0);
-            return;
-        }
-
-        const child1 = b2Verify(node.child1);
-        const child2 = b2Verify(node.child2);
-
-        // DEBUG: const height1 = child1.height;
-        // DEBUG: const height2 = child2.height;
-        // DEBUG: const height = 1 + Math.max(height1, height2);
-        // DEBUG: b2Assert(node.height === height);
-
-        // DEBUG: const { aabb } = temp;
-        // DEBUG: aabb.Combine2(child1.aabb, child2.aabb);
-
-        // DEBUG: b2Assert(aabb.lowerBound === node.aabb.lowerBound);
-        // DEBUG: b2Assert(aabb.upperBound === node.aabb.upperBound);
-
-        this.ValidateMetrics(child1);
-        this.ValidateMetrics(child2);
-    }
-
-    public Validate(): void {
-        // DEBUG: this.ValidateStructure(this.m_root);
-        // DEBUG: this.ValidateMetrics(this.m_root);
-        // let freeCount = 0;
-        // let freeNode: b2TreeNode<T> | null = this.m_freeList;
-        // while (freeNode !== null) {
-        //   freeNode = freeNode.parent;
-        //   ++freeCount;
-        // }
-        // DEBUG: b2Assert(this.GetHeight() === this.ComputeHeight());
-        // b2Assert(this.m_nodeCount + freeCount === this.m_nodeCapacity);
-    }
-
     public GetMaxBalance(): number {
         if (this.m_root === null) {
             return 0;
         }
         return this.m_root.GetMaxBalance();
     }
 
-    /**
-     * Build an optimal tree. Very expensive. For testing.
-     */
-    public RebuildBottomUp(): void {
-        throw new Error("Not implemented");
-        /*
-    int32* nodes = (int32*)b2Alloc(m_nodeCount * sizeof(int32));
-    int32 count = 0;
-
-    // Build array of leaves. Free the rest.
-    for (int32 i = 0; i < m_nodeCapacity; ++i) {
-      if (m_nodes[i].height < 0) {
-        // free node in pool
-        continue;
-      }
-
-      if (m_nodes[i].IsLeaf()) {
-        m_nodes[i].parent = b2_nullNode;
-        nodes[count] = i;
-        ++count;
-      } else {
-        FreeNode(i);
-      }
-    }
-
-    while (count > 1) {
-      float32 minCost = b2_maxFloat;
-      int32 iMin = -1, jMin = -1;
-      for (int32 i = 0; i < count; ++i) {
-        b2AABB aabbi = m_nodes[nodes[i]].aabb;
-
-        for (int32 j = i + 1; j < count; ++j) {
-          b2AABB aabbj = m_nodes[nodes[j]].aabb;
-          b2AABB b;
-          b.Combine(aabbi, aabbj);
-          float32 cost = b.GetPerimeter();
-          if (cost < minCost) {
-            iMin = i;
-            jMin = j;
-            minCost = cost;
-          }
-        }
-      }
-
-      int32 index1 = nodes[iMin];
-      int32 index2 = nodes[jMin];
-      b2TreeNode<T>* child1 = m_nodes + index1;
-      b2TreeNode<T>* child2 = m_nodes + index2;
-
-      int32 parentIndex = AllocateNode();
-      b2TreeNode<T>* parent = m_nodes + parentIndex;
-      parent.child1 = index1;
-      parent.child2 = index2;
-      parent.height = 1 + Math.max(child1.height, child2.height);
-      parent.aabb.Combine(child1.aabb, child2.aabb);
-      parent.parent = b2_nullNode;
-
-      child1.parent = parentIndex;
-      child2.parent = parentIndex;
-
-      nodes[jMin] = nodes[count-1];
-      nodes[iMin] = parentIndex;
-      --count;
-    }
-
-    m_root = nodes[0];
-    b2Free(nodes);
-    */
-
-        this.Validate();
-    }
-
     public ShiftOrigin(newOrigin: XY): void {
         this.m_root?.ShiftOrigin(newOrigin);
     }

diff --git a/packages/core/src/common/b2_timer.ts b/packages/core/src/common/b2_timer.ts
@@ -21,7 +21,7 @@
  * not work on every platform.
  */
 export class b2Timer {
-    public m_start = performance.now();
+    private m_start = performance.now();
 
     /**
      * Reset the timer.