@woosh/meep-engine 2.34.43 → 2.34.44

package/core/bvh2/BinaryNode.js

@@ -8,12 +8,14 @@ import { arrayQuickSort } from "../collection/array/arrayQuickSort.js";
 import { max2 } from "../math/max2.js";
 import { min2 } from "../math/min2.js";
 import { computeSampleStandardDeviation } from "../math/statistics/computeSampleStandardDeviation.js";
-import { _boxSurfaceArea2, aabb3_intersect_aabb3, boxSurfaceArea2 } from "./aabb3/AABB3Math.js";
 import { isLeaf, LeafNode } from "./LeafNode.js";
 import { Node } from "./Node.js";
 import { surfaceAreaHeuristic } from "./sah/surfaceAreaHeuristic.js";
 import { BVHVisitor } from "./traversal/BVHVisitor.js";
 import { traverseBinaryNodeUsingVisitor } from "./traversal/traverseBinaryNodeUsingVisitor.js";
+import { aabb3_intersect_aabb3 } from "./aabb3/aabb3_intersect_aabb3.js";
+import { aabb3_box_surface_area_2 } from "./aabb3/aabb3_box_surface_area_2.js";
+import { aabb3_compute_half_surface_area } from "./aabb3/aabb3_compute_half_surface_area.js";
 
 
 /**
@@ -288,8 +290,8 @@ export class BinaryNode extends Node {
                 }
 
                 //change costs to be based on balance
-                aCost = a.leafNodeCount / boxSurfaceArea2(a);
-                bCost = b.leafNodeCount / boxSurfaceArea2(b);
+                aCost = a.leafNodeCount / aabb3_box_surface_area_2(a);
+                bCost = b.leafNodeCount / aabb3_box_surface_area_2(b);
             }
 
             if (aCost === bCost) {
@@ -480,7 +482,7 @@ export class BinaryNode extends Node {
             leftArea = 0;
             leftLeaves = 0;
         } else {
-            leftArea = boxSurfaceArea2(left);
+            leftArea = aabb3_box_surface_area_2(left);
             leftLeaves = left.leafNodeCount;
         }
 
@@ -489,11 +491,11 @@ export class BinaryNode extends Node {
             rightArea = 0;
             rightLeaves = 0;
         } else {
-            rightArea = boxSurfaceArea2(right);
+            rightArea = aabb3_box_surface_area_2(right);
             rightLeaves = right.leafNodeCount;
         }
 
-        const thisArea = boxSurfaceArea2(this);
+        const thisArea = aabb3_box_surface_area_2(this);
 
         return surfaceAreaHeuristic(thisArea, leftArea, rightArea, leftLeaves, rightLeaves);
     }
@@ -1140,7 +1142,7 @@ function inclusion_surface_area_heuristic(node, addition) {
     const y1 = max2(node.y1, addition.y1);
     const z1 = max2(node.z1, addition.z1);
 
-    return _boxSurfaceArea2(x0, y0, z0, x1, y1, z1) - boxSurfaceArea2(node);
+    return aabb3_compute_half_surface_area(x0, y0, z0, x1, y1, z1) - aabb3_box_surface_area_2(node);
 }
 
 /**
@@ -1150,7 +1152,7 @@ function inclusion_surface_area_heuristic(node, addition) {
  */
 function inclusion_cost_lower_bound(node, addition) {
     let n = node;
-    let r = boxSurfaceArea2(addition);
+    let r = aabb3_box_surface_area_2(addition);
 
     while (n !== null) {
 

package/core/bvh2/LeafNode.js

@@ -1,8 +1,9 @@
 /**
  * Created by Alex on 17/11/2014.
  */
-import { deserializeAABB3, serializeAABB3 } from "./aabb3/AABB3.js";
 import { Node } from "./Node.js";
+import { serializeAABB3 } from "./aabb3/serializeAABB3.js";
+import { deserializeAABB3 } from "./aabb3/deserializeAABB3.js";
 
 
 /**