@woosh/meep-engine 2.47.3 → 2.47.8

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

@@ -1,11 +1,12 @@
 //
 import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
-import { aabb3_array_intersects_frustum_degree } from "../../aabb3/aabb3_array_intersects_frustum_degree.js";
+import { aabb3_array_intersects_frustum_degree } from "../../../geom/3d/aabb/aabb3_array_intersects_frustum_degree.js";
 import { bvh_collect_user_data } from "./bvh_collect_user_data.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 
-const traversal_stack = [];
+const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
-const scratch_aabb = [];
+const scratch_aabb = new Float32Array(6);
 
 /**
  *
@@ -30,20 +31,20 @@ export function bvh_query_user_data_overlaps_frustum(
      *
      * @type {number}
      */
-    let traversal_cursor = 1;
+    const stack_top = stack.pointer++;
 
-    traversal_stack[0] = root;
+    stack[stack_top] = root;
 
     let result_cursor = result_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];
 
         // test node against the ray
         bvh.node_get_aabb(node, scratch_aabb);
@@ -56,26 +57,22 @@ export function bvh_query_user_data_overlaps_frustum(
 
         const node_is_leaf = bvh.node_is_leaf(node);
 
-        if (!node_is_leaf) {
-
-            if (intersection === 2) {
-                // fully inside, fast collection path
-                result_cursor += bvh_collect_user_data(result, result_cursor, bvh, node);
-            } else {
-                // partially inside
-                // read in-order
-                const child1 = bvh.node_get_child1(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;
-            }
-
-        } else {
+        if (node_is_leaf) {
             // leaf node
-
             result[result_cursor++] = bvh.node_get_user_data(node);
+
+        } else if (intersection === 2) {
+            // fully inside, fast collection path
+            result_cursor += bvh_collect_user_data(result, result_cursor, bvh, node);
+        } else {
+            // partially inside
+            // read in-order
+            const child1 = bvh.node_get_child1(node);
+            const child2 = bvh.node_get_child2(node);
+
+            // write to stack in reverse order, so that fist child ends up being visited first
+            stack[stack.pointer++] = child1;
+            stack[stack.pointer++] = child2;
         }
     }
 

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

@@ -3,11 +3,12 @@
 
 import { array_copy } from "../../../collection/array/copyArray.js";
 import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
-import { aabb3_array_intersects_frustum_degree } from "../../aabb3/aabb3_array_intersects_frustum_degree.js";
+import { aabb3_array_intersects_frustum_degree } from "../../../geom/3d/aabb/aabb3_array_intersects_frustum_degree.js";
 import { bvh_collect_user_data } from "./bvh_collect_user_data.js";
 import { v3_distance_above_plane } from "../../../geom/v3_distance_above_plane.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 
-const traversal_stack = [];
+const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
 const scratch_aabb = [];
 
@@ -33,9 +34,9 @@ export function compute_tight_near_far_clipping_planes(result, result_offset, co
      *
      * @type {number}
      */
-    let traversal_cursor = 1;
+    const stack_top = stack.pointer++;
 
-    traversal_stack[0] = root;
+    stack[stack_top] = root;
 
     let result_cursor = result_offset;
 
@@ -47,14 +48,14 @@ export function compute_tight_near_far_clipping_planes(result, result_offset, co
         y1,
         z1;
 
-    node_loop: while (traversal_cursor > 0) {
-        traversal_cursor--;
+    node_loop: 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
         bvh.node_get_aabb(node, scratch_aabb);
@@ -141,8 +142,8 @@ export function compute_tight_near_far_clipping_planes(result, result_offset, co
                 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 {
@@ -151,6 +152,4 @@ export function compute_tight_near_far_clipping_planes(result, result_offset, co
         }
     }
 
-    // drop stack frame
-
 }

package/src/core/bvh2/transform/BottomUpOptimizingRebuilder.js

@@ -1,8 +1,8 @@
 import { BinaryNode } from "../BinaryNode.js";
 import { isLeaf } from "../LeafNode.js";
 import { surfaceAreaHeuristic } from "../sah/surfaceAreaHeuristic.js";
-import { aabb3_score_boxes_SAH } from "../aabb3/aabb3_score_boxes_SAH.js";
-import { aabb3_box_surface_area_2 } from "../aabb3/aabb3_box_surface_area_2.js";
+import { aabb3_score_boxes_SAH } from "../../geom/3d/aabb/aabb3_score_boxes_SAH.js";
+import { aabb3_box_surface_area_2 } from "../../geom/3d/aabb/aabb3_box_surface_area_2.js";
 
 function BottomUpOptimizingRebuilder() {
     this.root = null;

package/src/core/bvh2/transform/tryRotateSingleNode.js

@@ -1,7 +1,7 @@
 import { surfaceAreaHeuristic as sah } from "../sah/surfaceAreaHeuristic.js";
 import { isLeaf } from "../LeafNode.js";
-import { aabb3_score_boxes_SAH as computeAreaFor2 } from "../aabb3/aabb3_score_boxes_SAH.js";
-import { aabb3_box_surface_area_2 as computeArea } from "../aabb3/aabb3_box_surface_area_2.js";
+import { aabb3_score_boxes_SAH as computeAreaFor2 } from "../../geom/3d/aabb/aabb3_score_boxes_SAH.js";
+import { aabb3_box_surface_area_2 as computeArea } from "../../geom/3d/aabb/aabb3_box_surface_area_2.js";
 
 /**
  *

package/src/core/bvh2/traversal/aabb3_detailed_volume_intersection_callback_based.js

@@ -1,4 +1,4 @@
-import { aabb3_detailed_volume_intersection } from "../aabb3/aabb3_detailed_volume_intersection.js";
+import { aabb3_detailed_volume_intersection } from "../../geom/3d/aabb/aabb3_detailed_volume_intersection.js";
 
 
 /**

package/src/core/bvh2/traversal/queryBinaryNode_FrustumIntersections.js

@@ -1,4 +1,4 @@
-import { aabb3_intersects_frustum_degree } from "../aabb3/aabb3_intersects_frustum_degree.js";
+import { aabb3_intersects_frustum_degree } from "../../geom/3d/aabb/aabb3_intersects_frustum_degree.js";
 import { queryBinaryNode_CollectData } from "./queryBinaryNode_CollectData.js";
 
 /**

package/src/core/collection/SCRATCH_UINT32_TRAVERSAL_STACK.js

@@ -0,0 +1,13 @@
+/**
+ * Useful for traversals, such as tree-walking. When using - make sure you manage dependencies nad understand the call-graph to avoid overwriting data that is used else-where
+ * Using a pre-allocated continuous chunk of memory gets us better cache coherence
+ * @readonly
+ * @type {Uint32Array|{pointer:number}}
+ */
+export const SCRATCH_UINT32_TRAVERSAL_STACK = new Uint32Array(781250);
+
+/**
+ * Pointer used to track current top of the stack, make sure to unwind once your traversal is done
+ * @type {number}
+ */
+SCRATCH_UINT32_TRAVERSAL_STACK.pointer = 0;

package/src/core/color/Color.d.ts

@@ -1,11 +1,12 @@
 import Signal from "../events/signal/Signal";
 
 export class Color {
-    constructor(r?: number, g?: number, b?: number)
+    constructor(r?: number, g?: number, b?: number,a?:number)
 
     r: number
     g: number
     b: number
+    a:number
 
     readonly onChanged: Signal<number, number, number, number, number, number>
 

package/src/core/color/Color.js

@@ -55,7 +55,7 @@ export class Color {
 
         /**
          * @readonly
-         * @type {Signal<number,number,number,number,number,number>}
+         * @type {Signal<number,number,number,number,number,number,number,number>}
          */
         this.onChanged = new Signal();
     }
@@ -131,19 +131,34 @@ export class Color {
      * @param {number} b
      */
     setRGB(r, g, b) {
+
+        this.set(r, g, b, this.a);
+    }
+
+    /**
+     *
+     * @param {number} r
+     * @param {number} g
+     * @param {number} b
+     * @param {number} a
+     */
+    set(r, g, b, a) {
         assert.isNumber(r, 'r');
         assert.isNumber(g, 'g');
         assert.isNumber(b, 'b');
+        assert.isNumber(a, 'a');
 
         const _r = this.r;
         const _g = this.g;
         const _b = this.b;
+        const _a = this.a;
 
         this.r = r;
         this.g = g;
         this.b = b;
+        this.a = a;
 
-        this.onChanged.send6(r, g, b, _r, _g, _b);
+        this.onChanged.send8(r, g, b, a, _r, _g, _b, _a);
     }
 
     /**
@@ -407,7 +422,10 @@ export class Color {
      * @param {Color} other
      */
     equals(other) {
-        return this.r === other.r && this.g === other.g && this.b === other.b;
+        return this.r === other.r
+            && this.g === other.g
+            && this.b === other.b
+            && this.a === other.a;
     }
 
     /**
@@ -443,15 +461,17 @@ export class Color {
         );
     }
 
-    fromJSON({ r, g, b }) {
+    fromJSON({ r, g, b, a = 1 }) {
         this.setRGB(r, g, b);
+        this.a = a;
     }
 
     toJSON() {
         return {
             r: this.r,
             g: this.g,
-            b: this.b
+            b: this.b,
+            a: this.a
         };
     }
 
@@ -460,6 +480,7 @@ export class Color {
         yield this.r;
         yield this.g;
         yield this.b;
+        yield this.a;
 
     }
 
@@ -472,6 +493,7 @@ export class Color {
         destination[destination_offset] = this.r;
         destination[destination_offset + 1] = this.g;
         destination[destination_offset + 2] = this.b;
+        destination[destination_offset + 3] = this.a;
     }
 
     /**
@@ -482,6 +504,7 @@ export class Color {
         buffer.writeFloat32(this.r);
         buffer.writeFloat32(this.g);
         buffer.writeFloat32(this.b);
+        buffer.writeFloat32(this.a);
     }
 
     /**
@@ -492,8 +515,10 @@ export class Color {
         const r = buffer.readFloat32();
         const g = buffer.readFloat32();
         const b = buffer.readFloat32();
+        const a = buffer.readFloat32();
 
         this.setRGB(r, g, b);
+        this.a = a;
     }
 
     /**

package/src/core/color/ColorUtils.js

@@ -7,7 +7,7 @@ import { parseHex } from "./parseHex.js";
 
 
 const rgbRegEx = /rgb\(\s*([0-9]+),\s*([0-9]+),\s*([0-9]+)\s*\)/;
-const rgbaRegEx = /rgba\(\s*([0-9]+),\s*([0-9]+),\s*([0-9]+),\s*([0-9]+(?:\.[0-9]*)?)\s*\)/;
+const rgbaRegEx = /rgba\(\s*([0-9]+(?:\.[0-9]*)?),\s*([0-9]+(?:\.[0-9]*)?),\s*([0-9]+(?:\.[0-9]*)?),\s*([0-9]+(?:\.[0-9]*)?)\s*\)/;
 const hsvRegEx = /hsv\(([0-9]+(?:\.[0-9]*)?),\s*([0-9]+(?:\.[0-9]*)?),\s*([0-9]+(?:\.[0-9]*)?)\)/;
 
 /**
@@ -36,10 +36,10 @@ export function parseColor(c) {
 
         } else if ((match = cL.match(rgbaRegEx)) !== null) {
 
-            r = parseInt(match[1]);
-            g = parseInt(match[2]);
-            b = parseInt(match[3]);
-            a = parseInt(match[4]);
+            r = parseFloat(match[1]);
+            g = parseFloat(match[2]);
+            b = parseFloat(match[3]);
+            a = parseFloat(match[4]);
 
         } else if ((match = cL.match(hsvRegEx)) !== null) {
 
@@ -60,6 +60,8 @@ export function parseColor(c) {
             r = rgb.r;
             g = rgb.g;
             b = rgb.b;
+            a = rgb.a;
+
 
         } else {
             throw new Error(`Failed to decode color string '${c}' `);

package/src/core/color/parseHex.js

@@ -5,14 +5,22 @@ function hex2dec(v) {
 /**
  *
  * @param {string} hex
- * @returns {{r: Number, g: Number, b: Number}} rgb
+ * @returns {{r: number, g: number, b: number, a:number}} rgb
  */
 export function parseHex(hex) {
 
 
-    return {
+    const result = {
         r: hex2dec(hex.slice(1, 3)),
         g: hex2dec(hex.slice(3, 5)),
-        b: hex2dec(hex.slice(5))
+        b: hex2dec(hex.slice(5, 7))
     };
+
+    if (hex.length > 7) {
+        result.a = hex2dec(hex.slice(7, 9));
+    }else{
+        result.a = 1;
+    }
+
+    return result;
 }

package/src/core/color/rgb2hex.js

@@ -1,4 +1,4 @@
-function dec2hex(c) {
+export function dec2hex(c) {
     const hex = Math.round(c).toString(16);
     return hex.length === 1 ? "0" + hex : hex;
 }

package/src/core/geom/3d/SurfacePoint3.d.ts

@@ -6,10 +6,17 @@ export class SurfacePoint3 {
     position: Vector3
     index: number
 
+    /**
+     * @deprecated use {@link applyMatrix4} instead
+     */
     applyMatrix4_three(matrix4: Matrix4): void
 
     applyMatrix4(m4: ArrayLike<number>): void
 
+    fromArray(array: ArrayLike<number>, offset?: number): void
+
+    toArray(array: ArrayLike<number>, offset?: number): void
+
     copy(other: SurfacePoint3): void
 
     clone(): SurfacePoint3

package/src/core/geom/3d/SurfacePoint3.js

@@ -7,7 +7,16 @@ import { assert } from "../../assert.js";
  */
 export class SurfacePoint3 {
     constructor() {
+        /**
+         * @readonly
+         * @type {Vector3}
+         */
         this.normal = new Vector3(0, 1, 0);
+
+        /**
+         * @readonly
+         * @type {Vector3}
+         */
         this.position = new Vector3(0, 0, 0);
 
         /**
@@ -18,6 +27,30 @@ export class SurfacePoint3 {
         this.index = -1;
     }
 
+    get 0() {
+        return this.position.x;
+    }
+
+    get 1() {
+        return this.position.y;
+    }
+
+    get 2() {
+        return this.position.z;
+    }
+
+    get 3() {
+        return this.normal.x;
+    }
+
+    get 4() {
+        return this.normal.y;
+    }
+
+    get 5() {
+        return this.normal.z;
+    }
+
     /**
      *
      * @param {number[]|mat4|Float32Array} m
@@ -67,13 +100,35 @@ export class SurfacePoint3 {
     }
 
     /**
-     *
+     * @deprecated use {@link applyMatrix4} instead
      * @param {THREE.Matrix4} matrix4
      */
     applyMatrix4_three(matrix4) {
+        console.warn('applyMatrix4_three is deprecated, use applyMatrix4 instead');
+
         this.applyMatrix4(matrix4.elements);
     }
 
+    /**
+     *
+     * @param {number[]|ArrayLike<number>|Float32Array} array
+     * @param {number} [offset=0]
+     */
+    fromArray(array, offset = 0) {
+        this.position.readFromArray(array, offset);
+        this.normal.readFromArray(array, offset + 3);
+    }
+
+    /**
+     *
+     * @param {number[]|ArrayLike<number>|Float32Array} array
+     * @param {number} [offset=0]
+     */
+    toArray(array, offset = 0) {
+        this.position.writeToArray(array, offset);
+        this.normal.writeToArray(array, offset + 3);
+    }
+
     /**
      *
      * @param {SurfacePoint3} other

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/aabb3_array_combine.js

@@ -1,7 +1,7 @@
 //
 
-import { min2 } from "../../math/min2.js";
-import { max2 } from "../../math/max2.js";
+import { min2 } from "../../../math/min2.js";
+import { max2 } from "../../../math/max2.js";
 
 /**
  * Merge bounds of two axis-aligned bounding boxes, the result is a box that tightly bounds inputs

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/aabb3_array_contains_point.js

@@ -2,7 +2,7 @@
 
 /**
  *
- * @param {ArrayLike<number>|number[]} aabb
+ * @param {ArrayLike<number>|number[]|AABB3} aabb
  * @param {number} x
  * @param {number} y
  * @param {number} z

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/aabb3_array_intersects_frustum_degree.js

@@ -3,8 +3,8 @@ import { aabb3_intersects_frustum_degree } from "./aabb3_intersects_frustum_degr
 
 /**
  *
- * @param {number[]} aabb
- * @param {number[]} frustum
+ * @param {number[]|Float32Array} aabb
+ * @param {number[]|Float32Array} frustum
  * @returns {number}
  */
 export function aabb3_array_intersects_frustum_degree(aabb, frustum) {

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/aabb3_combined_surface_area.js

@@ -1,5 +1,5 @@
-import { min2 } from "../../math/min2.js";
-import { max2 } from "../../math/max2.js";
+import { min2 } from "../../../math/min2.js";
+import { max2 } from "../../../math/max2.js";
 import { aabb3_compute_half_surface_area } from "./aabb3_compute_half_surface_area.js";
 
 /**

package/src/core/geom/3d/aabb/aabb3_compute_distance_above_plane_max.js

@@ -12,7 +12,7 @@
  * @param {number} _z1
  * @returns {number}
  */
-export function aabb3_computeDistanceAbovePlane_max(
+export function aabb3_compute_distance_above_plane_max(
     plane_normal_x, plane_normal_y, plane_normal_z, plane_constant,
     _x0, _y0, _z0,
     _x1, _y1, _z1

package/src/core/geom/3d/aabb/aabb3_compute_distance_above_plane_max.spec.js

@@ -0,0 +1,8 @@
+import { aabb3_compute_distance_above_plane_max } from "./aabb3_compute_distance_above_plane_max.js";
+
+test('cube above orthographic plane',()=>{
+    expect(aabb3_compute_distance_above_plane_max(
+        0,1,0,-1,
+        -1,3,-1,1,5,1
+    )).toBe(4);
+});

package/src/core/geom/3d/aabb/{computeAABB3PlaneSide.js → aabb3_compute_plane_side.js}

@@ -14,7 +14,7 @@ import { v3_distance_above_plane } from "../../v3_distance_above_plane.js";
  * @param {number} _z1
  * @returns {number}
  */
-export function computeAABB3PlaneSide(
+export function aabb3_compute_plane_side(
     plane_normal_x,
     plane_normal_y,
     plane_normal_z,

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/aabb3_detailed_volume_intersection.js

@@ -1,12 +1,12 @@
-import { aabb3_build_corners } from "../../geom/3d/aabb/aabb3_build_corners.js";
-import { aabb_build_frustum } from "../../geom/3d/aabb/aabb3_build_frustum.js";
-import { plane3_computeLineSegmentIntersection } from "../../geom/Plane.js";
+import { aabb3_build_corners } from "./aabb3_build_corners.js";
+import { aabb_build_frustum } from "./aabb3_build_frustum.js";
+import { plane3_computeLineSegmentIntersection } from "../../Plane.js";
 import { aabb3_corner_edge_mapping } from "./aabb3_corner_edge_mapping.js";
 import { aabb3_edge_corner_mapping } from "./aabb3_edge_corner_mapping.js";
-import { plane_computeConvex3PlaneIntersection } from "../../geom/3d/plane/plane_computeConvex3PlaneIntersection.js";
-import { is_point_within_planes } from "../../geom/3d/plane/is_point_within_planes.js";
-import { v3_distance_above_plane } from "../../geom/v3_distance_above_plane.js";
-import { EPSILON } from "../../math/EPSILON.js";
+import { plane_computeConvex3PlaneIntersection } from "../plane/plane_computeConvex3PlaneIntersection.js";
+import { is_point_within_planes } from "../plane/is_point_within_planes.js";
+import { v3_distance_above_plane } from "../../v3_distance_above_plane.js";
+import { EPSILON } from "../../../math/EPSILON.js";
 
 /**
  * Common piece of continuous memory for better cache coherence

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/aabb3_from_v3_array.js

@@ -1,11 +1,11 @@
-import { min2 } from "../../math/min2.js";
-import { max2 } from "../../math/max2.js";
+import { min2 } from "../../../math/min2.js";
+import { max2 } from "../../../math/max2.js";
 
 /**
  *
  * @param {AABB3} result
- * @param {number[]|ArrayLike<number>} input
- * @param {number} input_length
+ * @param {number[]|ArrayLike<number>|Float32Array} input
+ * @param {number} input_length length of the input array
  */
 export function aabb3_from_v3_array(result, input, input_length) {
     let x0 = Infinity;

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/aabb3_from_v3_array_transformed.js

@@ -1,5 +1,5 @@
-import { min2 } from "../../math/min2.js";
-import { max2 } from "../../math/max2.js";
+import { min2 } from "../../../math/min2.js";
+import { max2 } from "../../../math/max2.js";
 
 /**
  *

package/src/core/{bvh2/aabb3/aabb3_intersect_aabb3.js → geom/3d/aabb/aabb3_intersects_aabb3.js}

@@ -1,4 +1,4 @@
-import { intersects1D } from "../../math/intersects1D.js";
+import { intersects1D } from "../../../math/intersects1D.js";
 
 /**
  *
@@ -16,7 +16,7 @@ import { intersects1D } from "../../math/intersects1D.js";
  * @param {number} bz1
  * @returns {boolean}
  */
-export function aabb3_intersect_aabb3(
+export function aabb3_intersects_aabb3(
     ax0, ay0, az0,
     ax1, ay1, az1,
     bx0, by0, bz0,

package/src/core/{bvh2/aabb3 → geom/3d/aabb}/aabb3_intersects_frustum_array.js

@@ -1,4 +1,4 @@
-import { aabb3_computeDistanceAbovePlane_max } from "../../geom/3d/aabb/aabb3_compute_distance_above_plane_max.js";
+import { aabb3_compute_distance_above_plane_max } from "./aabb3_compute_distance_above_plane_max.js";
 
 /**
  *
@@ -19,7 +19,7 @@ export function aabb3_intersects_frustum_array(x0, y0, z0, x1, y1, z1, frustum)
         const plane_z = frustum[i + 2];
         const plane_w = frustum[i + 3];
 
-        const plane_distance = aabb3_computeDistanceAbovePlane_max(
+        const plane_distance = aabb3_compute_distance_above_plane_max(
             plane_x, plane_y, plane_z, plane_w,
             x0, y0, z0,
             x1, y1, z1