@woosh/meep-engine 2.69.0 → 2.71.0

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.69.0",
+  "version": "2.71.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/__module.js

@@ -9,3 +9,4 @@ export * from "./geom/Vector1.js";
 export * from "./events/signal/Signal.js";
 export * from "./events/signal/SignalBinding.js";
 export * from "./geom/Quaternion.js";
+export { quat3_createFromAxisAngle } from "./geom/3d/quaternion/quat3_createFromAxisAngle.js";

package/src/core/binary/BinaryBuffer.js

@@ -4,6 +4,7 @@
  */
 import { assert } from "../assert.js";
 import { array_copy } from "../collection/array/array_copy.js";
+import { typed_array_copy } from "../collection/array/typed/typed_array_copy.js";
 
 /**
  *
@@ -142,8 +143,7 @@ export class BinaryBuffer {
         const newData = new Uint8Array(capacity);
 
         //copy old data
-        const copyLength = Math.min(newData.length, oldData.length);
-        newData.set(oldData.subarray(0, copyLength), 0);
+        typed_array_copy(oldData, newData);
 
         this.data = newData.buffer;
         this.__data_uint8 = newData;
@@ -152,15 +152,24 @@ export class BinaryBuffer {
         this.capacity = capacity;
     }
 
-    ensureCapacity(minCapacity) {
-        if (this.capacity < minCapacity) {
-            const newCapacity = Math.ceil(Math.max(
-                minCapacity,
-                this.capacity * this.__growFactor,
-                this.capacity + MIN_GROWTH_STEP
-            ));
-            this.setCapacity(newCapacity);
+    /**
+     *
+     * @param {number} min_capacity
+     */
+    ensureCapacity(min_capacity) {
+        const existing_capacity = this.capacity;
+
+        if (existing_capacity >= min_capacity) {
+            return;
         }
+
+        const new_capacity = Math.ceil(Math.max(
+            min_capacity,
+            existing_capacity * this.__growFactor,
+            existing_capacity + MIN_GROWTH_STEP
+        ));
+
+        this.setCapacity(new_capacity);
     }
 
     readFloat32() {
@@ -825,16 +834,14 @@ export class BinaryBuffer {
         //mark non-NULL
         this.writeUint32(len);
 
-        const startPosition = this.position;
-
-        let at = startPosition;  // output position
-
-        let tlen = Math.max(32, len + (len >> 1) + 7);  // 1.5x size
+        let cursor = this.position;  // output position
 
-        this.ensureCapacity(tlen + at);
+        const expected_byte_size = Math.max(32, len + (len >> 1) + 7);  // 1.5x size
 
-        let target = this.__data_uint8;  // ... but at 8 byte offset
+        this.ensureCapacity(expected_byte_size + cursor);
 
+        let target = this.__data_uint8;
+        let capacity = this.capacity;
 
         while (pos < len) {
             let value = string.charCodeAt(pos++);
@@ -853,37 +860,36 @@ export class BinaryBuffer {
             }
 
             // expand the buffer if we couldn't write 4 bytes
-            if (at + 4 > this.capacity) {
-                tlen += 8;  // minimum extra
-                tlen *= (1.0 + (pos / len) * 2);  // take 2x the remaining
-                tlen = (tlen >> 3) << 3;  // 8 byte offset
+            if (cursor + 4 > capacity) {
 
-                this.ensureCapacity(tlen + startPosition);
+                this.ensureCapacity(cursor + 4);
 
+                // rebind variables
+                capacity = this.capacity;
                 target = this.__data_uint8;
             }
 
             if ((value & 0xffffff80) === 0) {  // 1-byte
-                target[at++] = value;  // ASCII
+                target[cursor++] = value;  // ASCII
                 continue;
             } else if ((value & 0xfffff800) === 0) {  // 2-byte
-                target[at++] = ((value >> 6) & 0x1f) | 0xc0;
+                target[cursor++] = ((value >> 6) & 0x1f) | 0xc0;
             } else if ((value & 0xffff0000) === 0) {  // 3-byte
-                target[at++] = ((value >> 12) & 0x0f) | 0xe0;
-                target[at++] = ((value >> 6) & 0x3f) | 0x80;
+                target[cursor++] = ((value >> 12) & 0x0f) | 0xe0;
+                target[cursor++] = ((value >> 6) & 0x3f) | 0x80;
             } else if ((value & 0xffe00000) === 0) {  // 4-byte
-                target[at++] = ((value >> 18) & 0x07) | 0xf0;
-                target[at++] = ((value >> 12) & 0x3f) | 0x80;
-                target[at++] = ((value >> 6) & 0x3f) | 0x80;
+                target[cursor++] = ((value >> 18) & 0x07) | 0xf0;
+                target[cursor++] = ((value >> 12) & 0x3f) | 0x80;
+                target[cursor++] = ((value >> 6) & 0x3f) | 0x80;
             } else {
                 // FIXME: do we care
                 continue;
             }
 
-            target[at++] = (value & 0x3f) | 0x80;
+            target[cursor++] = (value & 0x3f) | 0x80;
         }
 
-        this.position = at;
+        this.position = cursor;
     }
 
     /**

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

@@ -2,10 +2,11 @@ import { assert } from "../../../assert.js";
 import { ceilPowerOfTwo } from "../../../binary/operations/ceilPowerOfTwo.js";
 import { array_copy } from "../../../collection/array/array_copy.js";
 import { array_swap } from "../../../collection/array/array_swap.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 import { aabb3_array_combine } from "../../../geom/3d/aabb/aabb3_array_combine.js";
 import { aabb3_array_set } from "../../../geom/3d/aabb/aabb3_array_set.js";
 import { aabb3_compute_half_surface_area } from "../../../geom/3d/aabb/aabb3_compute_half_surface_area.js";
-import { mortonEncode_magicbits } from "../../../geom/3d/morton/mortonEncode_magicbits.js";
+import { v3_morton_encode_bounded } from "../../../geom/3d/morton/v3_morton_encode_bounded.js";
 import { max2 } from "../../../math/max2.js";
 import { max3 } from "../../../math/max3.js";
 import { min2 } from "../../../math/min2.js";
@@ -54,10 +55,10 @@ function copy_box_zero_size(data, destination, source) {
  * Assumes data will be normalized to 0...1 value range
  * @param {Float32Array} data
  * @param {number} address
- * @param {number[]} matrix
+ * @param {number[]} bounds
  * @returns {number}
  */
-function build_morton(data, address, matrix) {
+function build_morton(data, address, bounds) {
 
     const x0 = data[address];
     const y0 = data[address + 1];
@@ -66,17 +67,15 @@ function build_morton(data, address, matrix) {
     const y1 = data[address + 4];
     const z1 = data[address + 5];
 
-    const cx = (x0 + x1) / 2;
-    const cy = (y0 + y1) / 2;
-    const cz = (z0 + z1) / 2;
+    const cx = (x0 + x1) * 0.5;
+    const cy = (y0 + y1) * 0.5;
+    const cz = (z0 + z1) * 0.5;
 
-    return mortonEncode_magicbits(cx, cy, cz);
-    // return v3_morton_encode_transformed(cx, cy, cz, matrix);
+    return v3_morton_encode_bounded(cx, cy, cz, bounds);
 
 }
 
-const scratch_box_0 = new Float32Array(18);
-const stack = [];
+const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
 export class BinaryUint32BVH {
     /**
@@ -307,17 +306,15 @@ export class BinaryUint32BVH {
      * @private
      */
     __compute_bounds_area_of_3_boxes(a, b, c) {
-        this.readBounds(a, scratch_box_0, 0);
-        this.readBounds(b, scratch_box_0, 6);
-        this.readBounds(c, scratch_box_0, 12);
+        const float32 = this.__data_float32;
 
-        const x0 = min3(scratch_box_0[0], scratch_box_0[6], scratch_box_0[12]);
-        const y0 = min3(scratch_box_0[1], scratch_box_0[7], scratch_box_0[13]);
-        const z0 = min3(scratch_box_0[2], scratch_box_0[8], scratch_box_0[14]);
+        const x0 = min3(float32[a + 0], float32[b + 0], float32[c + 0]);
+        const y0 = min3(float32[a + 1], float32[b + 1], float32[c + 1]);
+        const z0 = min3(float32[a + 2], float32[b + 2], float32[c + 2]);
 
-        const x1 = max3(scratch_box_0[3], scratch_box_0[9], scratch_box_0[15]);
-        const y1 = max3(scratch_box_0[4], scratch_box_0[10], scratch_box_0[16]);
-        const z1 = max3(scratch_box_0[5], scratch_box_0[11], scratch_box_0[17]);
+        const x1 = max3(float32[a + 3], float32[b + 3], float32[c + 3]);
+        const y1 = max3(float32[a + 4], float32[b + 4], float32[c + 4]);
+        const z1 = max3(float32[a + 5], float32[b + 5], float32[c + 5]);
 
         return aabb3_compute_half_surface_area(x0, y0, z0, x1, y1, z1);
     }
@@ -369,9 +366,9 @@ export class BinaryUint32BVH {
 
     /**
      * Sort leaf nodes according to their morton codes
-     * @param {number[]} projection
+     * @param {number[]} bounds
      */
-    sort_morton(projection) {
+    sort_morton(bounds) {
 
         const leaf_block_address = this.__node_count_binary * BVH_BINARY_NODE_SIZE;
 
@@ -401,15 +398,15 @@ export class BinaryUint32BVH {
 
             const pivot_address = pivotIndex * BVH_LEAF_NODE_SIZE + leaf_block_address;
 
-            const pivot = build_morton(data, pivot_address, projection);
+            const pivot = build_morton(data, pivot_address, bounds);
 
             /* partition */
             while (i <= j) {
-                while (build_morton(data, i * BVH_LEAF_NODE_SIZE + leaf_block_address, projection) < pivot) {
+                while (build_morton(data, i * BVH_LEAF_NODE_SIZE + leaf_block_address, bounds) < pivot) {
                     i++;
                 }
 
-                while (build_morton(data, j * BVH_LEAF_NODE_SIZE + leaf_block_address, projection) > pivot) {
+                while (build_morton(data, j * BVH_LEAF_NODE_SIZE + leaf_block_address, bounds) > pivot) {
                     j--;
                 }
 

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

@@ -129,10 +129,8 @@ test('4 node sorted build', () => {
     bvh.setLeafData(3, 13, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6);
 
     bvh.sort_morton([
-        1, 0, 0, 0,
-        0, 1, 0, 0,
-        0, 0, 1, 0,
-        0, 0, 0, 1
+        0, 0, 0,
+        1, 1, 1
     ]);
     bvh.build();
 });

package/src/core/geom/3d/cone/compute_bounding_cone_of_2_cones.js

@@ -1,9 +1,10 @@
 //
 
 
-import Vector3 from "../../Vector3.js";
-import Quaternion, { quat3_createFromAxisAngle } from "../../Quaternion.js";
 import { max2 } from "../../../math/max2.js";
+import Quaternion from "../../Quaternion.js";
+import Vector3 from "../../Vector3.js";
+import { quat3_createFromAxisAngle } from "../quaternion/quat3_createFromAxisAngle.js";
 
 const tangent = new Vector3();
 

package/src/core/geom/3d/morton/v3_morton_encode_bounded.js

@@ -0,0 +1,34 @@
+import { mortonEncode_magicbits } from "./mortonEncode_magicbits.js";
+
+/**
+ * @param {number} x
+ * @param {number} y
+ * @param {number} z
+ * @param {number[]} bounds
+ * @returns {number}
+ */
+export function v3_morton_encode_bounded(x, y, z, bounds) {
+
+    const bounds_x0 = bounds[0];
+    const bounds_y0 = bounds[1];
+    const bounds_z0 = bounds[2];
+
+    const bounds_x1 = bounds[3];
+    const bounds_y1 = bounds[4];
+    const bounds_z1 = bounds[5];
+
+    const bounds_span_x = bounds_x1 - bounds_x0;
+    const bounds_span_y = bounds_y1 - bounds_y0;
+    const bounds_span_z = bounds_z1 - bounds_z0;
+
+    // scale to 10 bits
+    const ndc_x = 1023 * (x - bounds_x0) / bounds_span_x;
+    const ndc_y = 1023 * (y - bounds_y0) / bounds_span_y;
+    const ndc_z = 1023 * (z - bounds_z0) / bounds_span_z;
+
+    return mortonEncode_magicbits(
+        Math.round(ndc_x),
+        Math.round(ndc_y),
+        Math.round(ndc_z)
+    );
+}

package/src/core/geom/3d/morton/v3_morton_encode_transformed.js

@@ -1,5 +1,5 @@
-import { mortonEncode_magicbits } from "./mortonEncode_magicbits.js";
 import { clamp } from "../../../math/clamp.js";
+import { mortonEncode_magicbits } from "./mortonEncode_magicbits.js";
 
 /**
  * Assumes that coordinates will be mapped to -1..1 range after transform
@@ -35,3 +35,4 @@ export function v3_morton_encode_transformed(x, y, z, matrix) {
         Math.round(pz)
     );
 }
+

package/src/core/geom/3d/quaternion/quat3_createFromAxisAngle.js

@@ -0,0 +1,11 @@
+/**
+ * just in case you need that function also
+ * @param {Vector3} axis
+ * @param {number} angle
+ * @param {Quaternion} result
+ */
+export function quat3_createFromAxisAngle(axis, angle, result) {
+    const halfAngle = angle * .5;
+    const s = Math.sin(halfAngle);
+    result.set(axis.x * s, axis.y * s, axis.z * s, Math.cos(halfAngle));
+}

package/src/core/geom/3d/quaternion/quat_decode_from_uint32.js

@@ -0,0 +1,53 @@
+const K = Math.SQRT1_2 / 511;
+
+/**
+ * Based on GDC talk from Bungie on destiny, compressing quaternions for animation
+ * @param {number[]} output
+ * @param {number} output_offset
+ * @param {number} value
+ */
+export function quat_decode_from_uint32(output, output_offset, value) {
+    //read components
+    const max = value & 0x3;
+
+    const iv0 = (value >> 2) & 0x3FF;
+    const iv1 = (value >> 12) & 0x3FF;
+    const iv2 = (value >> 22) & 0x3FF;
+
+    //scale components back to quaternion range
+    const v0 = iv0 * K - Math.SQRT1_2;
+    const v1 = iv1 * K - Math.SQRT1_2;
+    const v2 = iv2 * K - Math.SQRT1_2;
+
+    //restore dropped component using quaternion identity: x^2 + y^2 + z^2 + w^2 = 1
+    const dropped_2 = 1 - v0 * v0 - v1 * v1 - v2 * v2;
+    const dropped = Math.sqrt(dropped_2);
+
+    let x, y, z, w;
+    if (max === 0) {
+        x = dropped
+        y = v0
+        z = v1
+        w = v2
+    } else if (max === 1) {
+        x = v0
+        y = dropped
+        z = v1
+        w = v2
+    } else if (max === 2) {
+        x = v0
+        y = v1
+        z = dropped
+        w = v2
+    } else {
+        x = v0
+        y = v1
+        z = v2
+        w = dropped
+    }
+
+    output[output_offset] = x;
+    output[output_offset + 1] = y;
+    output[output_offset + 2] = z;
+    output[output_offset + 3] = w;
+}

package/src/core/geom/3d/quaternion/quat_encode_to_uint32.js

@@ -0,0 +1,105 @@
+import { assert } from "../../../assert.js";
+
+/**
+ * Based on GDC talk from Bungie on destiny, compressing quaternions for animation
+ * @param {number} x
+ * @param {number} y
+ * @param {number} z
+ * @param {number} w
+ * @returns {number}
+ */
+export function quat_encode_to_uint32(x, y, z, w) {
+
+    const absX = Math.abs(x);
+    const absY = Math.abs(y);
+    const absZ = Math.abs(z);
+    const absW = Math.abs(w);
+
+    let v0, v1, v2, dropped, max;
+
+    //pick max component
+    if (absY > absX) {
+        if (absY > absZ) {
+            if (absY > absW) {
+                //absY is max
+                max = 1;
+            } else {
+                //absW is max
+                max = 3;
+            }
+        } else if (absZ > absW) {
+            //absZ is max
+            max = 2;
+        } else {
+            //absW is max
+            max = 3;
+        }
+    } else if (absX > absZ) {
+        if (absX > absW) {
+            max = 0;
+        } else {
+            max = 3;
+        }
+    } else if (absZ > absW) {
+        max = 2;
+    } else {
+        max = 3;
+    }
+
+
+    //max will be dropped
+    if (max === 0) {
+        //dropping x
+        v0 = y;
+        v1 = z;
+        v2 = w;
+
+        dropped = x;
+    } else if (max === 1) {
+        //dropping y
+        v0 = x;
+        v1 = z;
+        v2 = w;
+
+        dropped = y;
+    } else if (max === 2) {
+        //dropping z
+        v0 = x;
+        v1 = y;
+        v2 = w;
+
+        dropped = z;
+    } else {
+        //dropping w
+        v0 = x;
+        v1 = y;
+        v2 = z;
+
+        dropped = w;
+    }
+
+    if (dropped < 0) {
+        //reconstructing dropped value is only possible if it is positive, so we invert the quaternion to make dropped value positive
+        v0 = -v0;
+        v1 = -v1;
+        v2 = -v2;
+    }
+
+    const l = Math.hypot(v0, v1, v2, dropped);
+    const m = 511 / (l * Math.SQRT1_2);
+
+    //re-normalize the remaining components to 10 bit UINT value
+    const oV0 = Math.round(v0 * m + 511);
+    const oV1 = Math.round(v1 * m + 511);
+    const oV2 = Math.round(v2 * m + 511);
+
+    assert.ok(oV0 <= 1023 && oV0 >= 0, `expected 0 <= ov0 <= 1023, instead was '${oV0}'`);
+    assert.ok(oV1 <= 1023 && oV1 >= 0, `expected 0 <= ov1 <= 1023, instead was '${oV1}'`);
+    assert.ok(oV2 <= 1023 && oV2 >= 0, `expected 0 <= ov2 <= 1023, instead was '${oV2}'`);
+
+
+    return (max & 0x3)
+        | ((oV0 & 0x3FF) << 2)
+        | ((oV1 & 0x3FF) << 12)
+        | ((oV2 & 0x3FF) << 22);
+}

package/src/core/geom/Quaternion.js

@@ -6,31 +6,21 @@
 import { assert } from "../assert.js";
 import Signal from "../events/signal/Signal.js";
 import { clamp } from "../math/clamp.js";
+import { EPSILON } from "../math/EPSILON.js";
+import { epsilonEquals } from "../math/epsilonEquals.js";
 import { lerp } from "../math/lerp.js";
-import Vector3 from "./Vector3.js";
-import { v3_dot } from "./vec3/v3_dot.js";
 import { min2 } from "../math/min2.js";
 import { computeHashFloat } from "../primitives/numbers/computeHashFloat.js";
-import { epsilonEquals } from "../math/epsilonEquals.js";
-import { EPSILON } from "../math/EPSILON.js";
+import { quat_decode_from_uint32 } from "./3d/quaternion/quat_decode_from_uint32.js";
+import { quat_encode_to_uint32 } from "./3d/quaternion/quat_encode_to_uint32.js";
+import { v3_dot } from "./vec3/v3_dot.js";
+import Vector3 from "./Vector3.js";
 
 
 const forward = new Vector3();
 const up = new Vector3();
 const right = new Vector3();
 
-/**
- * just in case you need that function also
- * @param {Vector3} axis
- * @param {number} angle
- * @param {Quaternion} result
- */
-export function quat3_createFromAxisAngle(axis, angle, result) {
-    const halfAngle = angle * .5;
-    const s = Math.sin(halfAngle);
-    result.set(axis.x * s, axis.y * s, axis.z * s, Math.cos(halfAngle));
-}
-
 class Quaternion {
     /**
      *
@@ -1453,31 +1443,7 @@ class Quaternion {
      * @param {number} value
      */
     decodeFromUint32(value) {
-        //read components
-        const max = value & 0x3;
-
-        const iv0 = (value >> 2) & 0x3FF;
-        const iv1 = (value >> 12) & 0x3FF;
-        const iv2 = (value >> 22) & 0x3FF;
-
-        //scale components back to quaternion range
-        const v0 = (iv0 / 511 - 1) * K_CONST;
-        const v1 = (iv1 / 511 - 1) * K_CONST;
-        const v2 = (iv2 / 511 - 1) * K_CONST;
-
-        //restore dropped component using quaternion identity: x^2 + y^2 + z^2 + w^2 = 1
-        const dropped_2 = 1 - v0 * v0 - v1 * v1 - v2 * v2;
-        const dropped = Math.sqrt(dropped_2);
-
-        if (max === 0) {
-            this.set(dropped, v0, v1, v2);
-        } else if (max === 1) {
-            this.set(v0, dropped, v1, v2);
-        } else if (max === 2) {
-            this.set(v0, v1, dropped, v2);
-        } else {
-            this.set(v0, v1, v2, dropped);
-        }
+        quat_decode_from_uint32(this, 0, value);
     }
 
     /**
@@ -1485,107 +1451,7 @@ class Quaternion {
      * @returns {number}
      */
     encodeToUint32() {
-        const x = this.x;
-        const y = this.y;
-        const z = this.z;
-        const w = this.w;
-
-        const absX = Math.abs(x);
-        const absY = Math.abs(y);
-        const absZ = Math.abs(z);
-        const absW = Math.abs(w);
-
-        let max = 0;
-
-        //pick max component
-        if (absY > absX) {
-            if (absY > absZ) {
-                if (absY > absW) {
-                    //absY is max
-                    max = 1;
-                } else {
-                    //absW is max
-                    max = 3;
-                }
-            } else if (absZ > absW) {
-                //absZ is max
-                max = 2;
-            } else {
-                //absW is max
-                max = 3;
-            }
-        } else if (absX > absZ) {
-            if (absX > absW) {
-                max = 0;
-            } else {
-                max = 3;
-            }
-        } else if (absZ > absW) {
-            max = 2;
-        } else {
-            max = 3;
-        }
-
-        let v0, v1, v2, dropped;
-
-        //max will be dropped
-        if (max === 0) {
-            //dropping x
-            v0 = y;
-            v1 = z;
-            v2 = w;
-
-            dropped = x;
-        } else if (max === 1) {
-            //dropping y
-            v0 = x;
-            v1 = z;
-            v2 = w;
-
-            dropped = y;
-        } else if (max === 2) {
-            //dropping z
-            v0 = x;
-            v1 = y;
-            v2 = w;
-
-            dropped = z;
-        } else {
-            //dropping w
-            v0 = x;
-            v1 = y;
-            v2 = z;
-
-            dropped = w;
-        }
-
-        if (dropped < 0) {
-            //reconstructing dropped value is only possible if it is positive, so we invert the quaternion to make dropped value positive
-            v0 = -v0;
-            v1 = -v1;
-            v2 = -v2;
-        }
-
-        const l = Math.sqrt(x * x + y * y + z * z + w * w);
-        const m = 1 / (l * K_CONST);
-
-        //re-normalize the remaining components to 10 bit UINT value
-        const oV0 = Math.round((v0 * m + 1) * 511);
-        const oV1 = Math.round((v1 * m + 1) * 511);
-        const oV2 = Math.round((v2 * m + 1) * 511);
-
-        assert.ok(oV0 <= 1023 && oV0 >= 0, `expected 0 <= ov0 <= 1023, instead was '${oV0}'`);
-        assert.ok(oV1 <= 1023 && oV1 >= 0, `expected 0 <= ov1 <= 1023, instead was '${oV1}'`);
-        assert.ok(oV2 <= 1023 && oV2 >= 0, `expected 0 <= ov2 <= 1023, instead was '${oV2}'`);
-
-
-        const result = (max & 0x3)
-            | ((oV0 & 0x3FF) << 2)
-            | ((oV1 & 0x3FF) << 12)
-            | ((oV2 & 0x3FF) << 22)
-        ;
-
-        return result;
+        return quat_encode_to_uint32(this.x, this.y, this.z, this.w);
     }
 
     /**