@woosh/meep-engine 2.47.2 → 2.47.8

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.47.2",
+  "version": "2.47.8",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {
@@ -39,7 +39,7 @@
     "opentype.js": "1.3.3",
     "robust-predicates": "3.0.1",
     "simplex-noise": "2.4.0",
-    "three": "^0.135.0"
+    "three": "0.135.0 - 0.136.0"
   },
   "devDependencies": {
     "@babel/core": "7.20.12",

package/src/core/binary/BitSet.spec.js

@@ -33,18 +33,18 @@ test("set and get a bit", () => {
     expect(set.get(10000)).toBe(false);
 });
 
-test("resizing up and down works as intended", () => {
+test.skip("resizing up and down works as intended", () => {
     const set = new BitSet();
 
     const c0 = set.capacity();
 
-    set.set(c0 + 1, true);
+    set.setRange(c0, c0 + 1000);
 
     const c1 = set.capacity();
     expect(c1).toBeGreaterThan(c0);
 
     //clear the bit
-    set.set(c0 + 1, false);
+    set.clearRange(c0, c0 + 1001);
 
     expect(set.capacity()).toBeLessThan(c1);
 });

package/src/core/bvh2/BinaryNode.js

@@ -13,9 +13,9 @@ 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_combined_surface_area } from "./aabb3/aabb3_combined_surface_area.js";
+import { aabb3_intersects_aabb3 } from "../geom/3d/aabb/aabb3_intersects_aabb3.js";
+import { aabb3_box_surface_area_2 } from "../geom/3d/aabb/aabb3_box_surface_area_2.js";
+import { aabb3_combined_surface_area } from "../geom/3d/aabb/aabb3_combined_surface_area.js";
 
 
 /**
@@ -394,13 +394,15 @@ export class BinaryNode extends Node {
         const a = this.left;
         const b = this.right;
 
-        this.x0 = min2(a.x0, b.x0);
-        this.y0 = min2(a.y0, b.y0);
-        this.z0 = min2(a.z0, b.z0);
+        const x0 = min2(a.x0, b.x0);
+        const y0 = min2(a.y0, b.y0);
+        const z0 = min2(a.z0, b.z0);
 
-        this.x1 = max2(a.x1, b.x1);
-        this.y1 = max2(a.y1, b.y1);
-        this.z1 = max2(a.z1, b.z1);
+        const x1 = max2(a.x1, b.x1);
+        const y1 = max2(a.y1, b.y1);
+        const z1 = max2(a.z1, b.z1);
+
+        this.setBounds(x0, y0, z0, x1, y1, z1);
     }
 
     bubbleRefit() {
@@ -723,7 +725,7 @@ export class BinaryNode extends Node {
             stackPointer--;
             const node = stack[stackPointer];
 
-            if (!aabb3_intersect_aabb3(
+            if (!aabb3_intersects_aabb3(
                 x0, y0, z0, x1, y1, z1,
                 node.x0, node.y0, node.z0, node.x1, node.y1, node.z1
             )) {

package/src/core/bvh2/aabb3/AABB3.js

@@ -3,18 +3,19 @@
  */
 
 
-import { aabb3_computeDistanceAbovePlane_max } from "../../geom/3d/aabb/aabb3_compute_distance_above_plane_max.js";
-import { computeAABB3PlaneSide } from "../../geom/3d/aabb/computeAABB3PlaneSide.js";
+import { aabb3_compute_distance_above_plane_max } from "../../geom/3d/aabb/aabb3_compute_distance_above_plane_max.js";
+import { aabb3_compute_plane_side } from "../../geom/3d/aabb/aabb3_compute_plane_side.js";
 import computeMortonCode from "../../geom/3d/morton/Morton.js";
 import { aabb3_build_corners } from "../../geom/3d/aabb/aabb3_build_corners.js";
 import { assert } from "../../assert.js";
-import { aabb3_intersects_frustum_degree } from "./aabb3_intersects_frustum_degree.js";
-import { aabb3_intersects_line_segment } from "./aabb3_intersects_line_segment.js";
-import { aabb3_intersects_ray } from "./aabb3_intersects_ray.js";
-import { aabb3_compute_surface_area } from "./aabb3_compute_surface_area.js";
-import { aabb3_intersects_frustum_array } from "./aabb3_intersects_frustum_array.js";
+import { aabb3_intersects_frustum_degree } from "../../geom/3d/aabb/aabb3_intersects_frustum_degree.js";
+import { aabb3_intersects_line_segment } from "../../geom/3d/aabb/aabb3_intersects_line_segment.js";
+import { aabb3_intersects_ray } from "../../geom/3d/aabb/aabb3_intersects_ray.js";
+import { aabb3_compute_surface_area } from "../../geom/3d/aabb/aabb3_compute_surface_area.js";
+import { aabb3_intersects_frustum_array } from "../../geom/3d/aabb/aabb3_intersects_frustum_array.js";
 import { aabb3_matrix4_project } from "../../geom/3d/aabb/aabb3_matrix4_project.js";
-import { aabb3_signed_distance_sqr_to_point } from "./aabb3_signed_distance_sqr_to_point.js";
+import { aabb3_signed_distance_sqr_to_point } from "../../geom/3d/aabb/aabb3_signed_distance_sqr_to_point.js";
+import { aabb3_array_contains_point } from "../../geom/3d/aabb/aabb3_array_contains_point.js";
 
 
 export class AABB3 {
@@ -103,19 +104,14 @@ export class AABB3 {
     }
 
     /**
-     *
+     * @deprecated use {@link aabb3_array_contains_point} directly
      * @param {number} x
      * @param {number} y
      * @param {number} z
      * @returns {boolean}
      */
     containsPoint(x, y, z) {
-        return x >= this.x0
-            && x <= this.x1
-            && y >= this.y0
-            && y <= this.y1
-            && z >= this.z0
-            && z <= this.z1;
+        return aabb3_array_contains_point(this, x, y, z);
     }
 
     /**
@@ -127,15 +123,9 @@ export class AABB3 {
      * @returns {boolean}
      */
     containsPointWithTolerance(x, y, z, tolerance) {
-        if (
-            (x + tolerance) < this.x0 || (x - tolerance) > this.x1
+        return !((x + tolerance) < this.x0 || (x - tolerance) > this.x1
             || (y + tolerance) < this.y0 || (y - tolerance) > this.y1
-            || (z + tolerance) < this.z0 || (z - tolerance) > this.z1
-        ) {
-            return false;
-        }
-
-        return true;
+            || (z + tolerance) < this.z0 || (z - tolerance) > this.z1);
     }
 
     computeMortonCode() {
@@ -187,6 +177,13 @@ export class AABB3 {
      * @param {Number} z1
      */
     setBounds(x0, y0, z0, x1, y1, z1) {
+        assert.notNaN(x0, 'x0');
+        assert.notNaN(y0, 'y0');
+        assert.notNaN(z0, 'z0');
+        assert.notNaN(x1, 'x1');
+        assert.notNaN(y1, 'y1');
+        assert.notNaN(z1, 'z1');
+
         /**
          *
          * @type {number}
@@ -713,13 +710,15 @@ export class AABB3 {
     readFromArray(source, offset = 0) {
         assert.isNonNegativeInteger(offset, 'offset');
 
-        this.x0 = source[offset];
-        this.y0 = source[offset + 1];
-        this.z0 = source[offset + 2];
+        const _x0 = source[offset];
+        const _y0 = source[offset + 1];
+        const _z0 = source[offset + 2];
+
+        const _x1 = source[offset + 3];
+        const _y1 = source[offset + 4];
+        const _z1 = source[offset + 5];
 
-        this.x1 = source[offset + 3];
-        this.y1 = source[offset + 4];
-        this.z1 = source[offset + 5];
+        this.setBounds(_x0, _y0, _z0, _x1, _y1, _z1);
     }
 
     /**
@@ -729,7 +728,7 @@ export class AABB3 {
     computePlaneSide(plane) {
         const normal = plane.normal;
 
-        return computeAABB3PlaneSide(
+        return aabb3_compute_plane_side(
             normal.x, normal.y, normal.z, plane.constant,
             this.x0, this.y0, this.z0,
             this.x1, this.y1, this.z1
@@ -745,7 +744,7 @@ export class AABB3 {
      * @returns {number}
      */
     computeDistanceAbovePlane(normal_x, normal_y, normal_z, offset) {
-        return aabb3_computeDistanceAbovePlane_max(
+        return aabb3_compute_distance_above_plane_max(
             normal_x, normal_y, normal_z, offset,
             this.x0, this.y0, this.z0,
             this.x1, this.y1, this.z1

package/src/core/bvh2/binary/2/BinaryUint32BVH.js

@@ -6,7 +6,7 @@ import { array_swap } from "../../../collection/array/array_swap.js";
 import { mortonEncode_magicbits } from "../../../geom/3d/morton/mortonEncode_magicbits.js";
 import { min3 } from "../../../math/min3.js";
 import { max3 } from "../../../math/max3.js";
-import { aabb3_compute_half_surface_area } from "../../aabb3/aabb3_compute_half_surface_area.js";
+import { aabb3_compute_half_surface_area } from "../../../geom/3d/aabb/aabb3_compute_half_surface_area.js";
 
 /**
  * @readonly

package/src/core/bvh2/binary/BinaryBVH.js

@@ -3,7 +3,7 @@
  */
 import PrimitiveType from "../../binary/type/PrimitiveTypes.js";
 import BinaryStructure from "../../binary/type/Type.js";
-import { aabb3_intersects_ray } from "../aabb3/aabb3_intersects_ray.js";
+import { aabb3_intersects_ray } from "../../geom/3d/aabb/aabb3_intersects_ray.js";
 
 const NodeType = {
     LEAF: 0,

package/src/core/bvh2/binary/RayLeafIntersectionVisitor.js

@@ -1,7 +1,7 @@
 import { noop } from "../../function/Functions.js";
 import { IndexedBinaryBVHVisitor } from "./IndexedBinaryBVHVisitor.js";
 import { NodeType } from "./NodeType.js";
-import { aabb3_intersects_ray } from "../aabb3/aabb3_intersects_ray.js";
+import { aabb3_intersects_ray } from "../../geom/3d/aabb/aabb3_intersects_ray.js";
 
 export class RayLeafIntersectionVisitor extends IndexedBinaryBVHVisitor {
     constructor() {

package/src/core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js

@@ -1,4 +1,4 @@
-import { aabb3_compute_surface_area } from "../aabb3/aabb3_compute_surface_area.js";
+import { aabb3_compute_surface_area } from "../../geom/3d/aabb/aabb3_compute_surface_area.js";
 import { min2 } from "../../math/min2.js";
 import { max2 } from "../../math/max2.js";
 import { assert } from "../../assert.js";

package/src/core/bvh2/bvh3/ebvh_build_for_geometry_morton.js

@@ -1,5 +1,5 @@
 import { AABB3 } from "../aabb3/AABB3.js";
-import { aabb3_from_v3_array } from "../aabb3/aabb3_from_v3_array.js";
+import { aabb3_from_v3_array } from "../../geom/3d/aabb/aabb3_from_v3_array.js";
 import morton from "../../geom/3d/morton/Morton.js";
 import { arrayQuickSort } from "../../collection/array/arrayQuickSort.js";
 import { compute_triangle_group_aabb3 } from "../../../engine/graphics/sh3/path_tracer/compute_triangle_group_aabb3.js";
@@ -133,7 +133,7 @@ export function ebvh_build_for_geometry_morton(bvh, index_array, position_array)
     let unprocessed_node_count = tri_count;
 
 
-    while (used_index < node_total_count) {
+    while (used_index < node_total_count && unprocessed_node_count > 1) {
 
         let added_nodes = 0;
         let cursor = 0;

package/src/core/bvh2/bvh3/query/BVHQueryIntersectsFrustum.js

@@ -1,5 +1,5 @@
 import { BVHQuery } from "./BVHQuery.js";
-import { aabb3_array_intersects_frustum_array } from "../../aabb3/aabb3_array_intersects_frustum_array.js";
+import { aabb3_array_intersects_frustum_array } from "../../../geom/3d/aabb/aabb3_array_intersects_frustum_array.js";
 
 const scratch_aabb = [];
 

package/src/core/bvh2/bvh3/query/BVHQueryIntersectsRay.js

@@ -1,5 +1,5 @@
 import { BVHQuery } from "./BVHQuery.js";
-import { aabb3_array_intersects_ray_array } from "../../aabb3/aabb3_array_intersects_ray_array.js";
+import { aabb3_array_intersects_ray_array } from "../../../geom/3d/aabb/aabb3_array_intersects_ray_array.js";
 
 const scratch_aabb = [];
 

package/src/core/bvh2/bvh3/query/bvh_collect_user_data.js

@@ -1,8 +1,10 @@
 //
 
 import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
+
+const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
-const traversal_stack = [];
 /**
  *
  * @param {number[]} destination
@@ -20,20 +22,20 @@ export function bvh_collect_user_data(destination, destination_offset, bvh, node
      *
      * @type {number}
      */
-    let traversal_cursor = 0;
+    const stack_top = stack.pointer++;
 
-    traversal_stack[traversal_cursor++] = node;
+    stack[stack_top] = node;
 
     let result_cursor = destination_offset;
 
-    while (traversal_cursor > 0) {
-        traversal_cursor--;
+    while (stack.pointer > stack_top) {
+        stack.pointer--;
 
         /**
          *
          * @type {number}
          */
-        const node = traversal_stack[traversal_cursor];
+        const node = stack[stack.pointer];
 
         const node_is_leaf = bvh.node_is_leaf(node);
 
@@ -44,8 +46,8 @@ export function bvh_collect_user_data(destination, destination_offset, bvh, node
             const child2 = bvh.node_get_child2(node);
 
             // write to stack in reverse order, so that fist child ends up being visited first
-            traversal_stack[traversal_cursor++] = child1;
-            traversal_stack[traversal_cursor++] = child2;
+            stack[stack.pointer++] = child1;
+            stack[stack.pointer++] = child2;
 
         } else {
             // leaf node

package/src/core/bvh2/bvh3/query/bvh_query_leaves_generic.js

@@ -1,17 +1,7 @@
 import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 
-/**
- *
- * @type {number[]}
- */
-const traversal_stack = [];
-
-/**
- *
- * @type {number}
- */
-let traversal_cursor = 0;
-
+const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
 /**
  *
@@ -25,7 +15,6 @@ export function bvh_query_leaves_generic(
     result, result_offset,
     bvh, query
 ) {
-    const stack_frame_address = traversal_cursor;
 
     const root = bvh.root;
 
@@ -33,18 +22,24 @@ export function bvh_query_leaves_generic(
         return 0;
     }
 
-    traversal_stack[traversal_cursor++] = root;
+    /**
+     *
+     * @type {number}
+     */
+    const stack_top = stack.pointer++;
+
+    stack[stack_top] = root;
 
     let result_cursor = result_offset;
 
-    while (traversal_cursor > stack_frame_address) {
-        traversal_cursor--;
+    while (stack.pointer > stack_top) {
+        stack.pointer--;
 
         /**
          *
          * @type {number}
          */
-        const node = traversal_stack[traversal_cursor];
+        const node = stack[stack.pointer];
 
         // test node against the ray
         const pass = query.evaluate(node, bvh);
@@ -62,8 +57,8 @@ export function bvh_query_leaves_generic(
             const child2 = bvh.node_get_child2(node);
 
             // write to stack in reverse order, so that fist child ends up being visited first
-            traversal_stack[traversal_cursor++] = child2;
-            traversal_stack[traversal_cursor++] = child1;
+            stack[stack.pointer++] = child2;
+            stack[stack.pointer++] = child1;
 
         } else {
             // leaf node
@@ -72,8 +67,5 @@ export function bvh_query_leaves_generic(
         }
     }
 
-    // drop stack frame
-    traversal_cursor = stack_frame_address;
-
     return result_cursor - result_offset;
 }

package/src/core/bvh2/bvh3/query/bvh_query_leaves_ray.js

@@ -1,16 +1,13 @@
-import { aabb3_intersects_ray } from "../../aabb3/aabb3_intersects_ray.js";
+import { aabb3_intersects_ray } from "../../../geom/3d/aabb/aabb3_intersects_ray.js";
 import {
     COLUMN_CHILD_1,
     COLUMN_CHILD_2,
     ELEMENT_WORD_COUNT,
     NULL_NODE
 } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 
-/**
- *
- * @type {number[]}
- */
-const traversal_stack = new Uint32Array(2048);
+const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
 
 /**
@@ -39,14 +36,15 @@ export function bvh_query_leaves_ray(
     }
 
 
-    traversal_stack[0] = root;
-
-    let result_cursor = result_offset;
     /**
      *
      * @type {number}
      */
-    let traversal_cursor = 1;
+    const stack_top = stack.pointer++;
+
+    stack[stack_top] = root;
+
+    let result_cursor = result_offset;
 
     /*
      For performance, we bind data directly to avoid extra copies required to read out AABB
@@ -55,13 +53,13 @@ export function bvh_query_leaves_ray(
     const uint32 = bvh.__data_uint32;
 
     do {
-        traversal_cursor--;
+        stack.pointer--;
 
         /**
          *
          * @type {number}
          */
-        const node = traversal_stack[traversal_cursor];
+        const node = stack[stack.pointer];
 
         const address = node * ELEMENT_WORD_COUNT;
 
@@ -83,15 +81,15 @@ export function bvh_query_leaves_ray(
         if (child_1 !== NULL_NODE) {
 
             // this is not a leaf node, push children onto traversal stack
-            traversal_stack[traversal_cursor++] = child_1;
-            traversal_stack[traversal_cursor++] = uint32[address + COLUMN_CHILD_2];
+            stack[stack.pointer++] = child_1;
+            stack[stack.pointer++] = uint32[address + COLUMN_CHILD_2];
 
         } else {
             // leaf node
 
             result[result_cursor++] = node;
         }
-    } while (traversal_cursor > 0);
+    } while (stack.pointer > stack_top);
 
     return result_cursor - result_offset;
 }

package/src/core/bvh2/bvh3/query/bvh_query_user_data_generic.js

@@ -1,16 +1,7 @@
 import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 
-/**
- *
- * @type {number[]}
- */
-const traversal_stack = [];
-
-/**
- *
- * @type {number}
- */
-let traversal_cursor = 0;
+const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
 
 /**
@@ -25,7 +16,6 @@ export function bvh_query_user_data_generic(
     result, result_offset,
     bvh, query
 ) {
-    const stack_frame_address = traversal_cursor;
 
     const root = bvh.root;
 
@@ -33,18 +23,24 @@ export function bvh_query_user_data_generic(
         return 0;
     }
 
-    traversal_stack[traversal_cursor++] = root;
+    /**
+     *
+     * @type {number}
+     */
+    const stack_top = stack.pointer++;
+
+    stack[stack_top] = root;
 
     let result_cursor = result_offset;
 
-    while (traversal_cursor > stack_frame_address) {
-        traversal_cursor--;
+    while (stack.pointer > stack_top) {
+        stack.pointer--;
 
         /**
          *
          * @type {number}
          */
-        const node = traversal_stack[traversal_cursor];
+        const node = stack[stack.pointer];
 
         // test node against the query
         const pass = query.evaluate(node, bvh);
@@ -62,8 +58,8 @@ export function bvh_query_user_data_generic(
             const child2 = bvh.node_get_child2(node);
 
             // write to stack in reverse order, so that fist child ends up being visited first
-            traversal_stack[traversal_cursor++] = child1;
-            traversal_stack[traversal_cursor++] = child2;
+            stack[stack.pointer++] = child1;
+            stack[stack.pointer++] = child2;
 
         } else {
             // leaf node
@@ -72,8 +68,5 @@ export function bvh_query_user_data_generic(
         }
     }
 
-    // drop stack frame
-    traversal_cursor = stack_frame_address;
-
     return result_cursor - result_offset;
 }

package/src/core/bvh2/bvh3/query/bvh_query_user_data_nearest_to_point.js

@@ -1,12 +1,7 @@
 import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
-import { aabb3_signed_distance_sqr_to_point } from "../../aabb3/aabb3_signed_distance_sqr_to_point.js";
+import { aabb3_signed_distance_sqr_to_point } from "../../../geom/3d/aabb/aabb3_signed_distance_sqr_to_point.js";
 import { max2 } from "../../../math/max2.js";
-
-/**
- *
- * @type {number[]}
- */
-const traversal_stack = [];
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 
 /**
  *
@@ -14,11 +9,7 @@ const traversal_stack = [];
  */
 const scratch_aabb = [];
 
-/**
- *
- * @type {number}
- */
-let traversal_cursor = 0;
+const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
 /**
  *
@@ -30,27 +21,31 @@ let traversal_cursor = 0;
  * @returns {number} user data of the leaf, or -1 if not found
  */
 export function bvh_query_user_data_nearest_to_point(bvh, x, y, z, max_distance = Infinity) {
-    const stack_frame_address = traversal_cursor;
-
-    const root = bvh.root;
+      const root = bvh.root;
 
     if (root === NULL_NODE) {
         return -1;
     }
 
-    traversal_stack[traversal_cursor++] = root;
+    /**
+     *
+     * @type {number}
+     */
+    const stack_top = stack.pointer++;
+
+    stack[stack_top] = root;
 
     let best_leaf_data = -1;
     let best_distance_sqr = max_distance * max_distance;
 
-    while (traversal_cursor > stack_frame_address) {
-        traversal_cursor--;
+    while (stack.pointer > stack_top) {
+        stack.pointer--;
 
         /**
          *
          * @type {number}
          */
-        const node = traversal_stack[traversal_cursor];
+        const node = stack[stack.pointer];
 
         bvh.node_get_aabb(node, scratch_aabb);
 
@@ -75,8 +70,8 @@ export function bvh_query_user_data_nearest_to_point(bvh, x, y, z, max_distance
             const child2 = bvh.node_get_child2(node);
 
             // write to stack in reverse order, so that fist child ends up being visited first
-            traversal_stack[traversal_cursor++] = child1;
-            traversal_stack[traversal_cursor++] = child2;
+            stack[stack.pointer++] = child1;
+            stack[stack.pointer++] = child2;
 
         } else {
 
@@ -89,8 +84,5 @@ export function bvh_query_user_data_nearest_to_point(bvh, x, y, z, max_distance
         }
     }
 
-    // drop stack frame
-    traversal_cursor = stack_frame_address;
-
     return best_leaf_data;
 }