@woosh/meep-engine 2.54.0 → 2.56.0

package/src/core/collection/{HashSet.js → set/HashSet.js}

@@ -1,11 +1,12 @@
-import { invokeObjectEquals } from "../model/object/invokeObjectEquals.js";
-import { invokeObjectHash } from "../model/object/invokeObjectHash.js";
-import { HashMap } from "./HashMap.js";
+import { invokeObjectEquals } from "../../model/object/invokeObjectEquals.js";
+import { invokeObjectHash } from "../../model/object/invokeObjectHash.js";
+import { HashMap } from "../map/HashMap.js";
 
 
 /**
  * Spec-compliant with ES Set interface
  * @template T
+ * @extends {Set}
  */
 export class HashSet {
     /**

package/src/core/collection/{Set.d.ts → set/Set.d.ts}

@@ -1,4 +1,4 @@
-import Signal from "../events/signal/Signal";
+import Signal from "../../events/signal/Signal";
 
 export default class Set<T> {
     on: {

package/src/core/collection/{Set.js → set/Set.js}

@@ -3,12 +3,28 @@
  */
 
 
-import Signal from "../events/signal/Signal.js";
+import Signal from "../../events/signal/Signal.js";
 
 /**
  * Structure with event signals for observing changes.
  */
 class Set {
+    /**
+     * @readonly
+     */
+    on = {
+        added: new Signal(),
+        removed: new Signal()
+    };
+
+    /**
+     * @private
+     * @type {T[]}
+     */
+    data = [];
+
+    length = 0;
+
     /**
      *
      * @param {Array.<T>} [array=[]]
@@ -17,19 +33,6 @@ class Set {
      * @property {{added: Signal, removed: Signal}} on
      */
     constructor(array) {
-        this.on = {
-            added: new Signal(),
-            removed: new Signal()
-        };
-
-        /**
-         *
-         * @type {T[]}
-         */
-        this.data = [];
-
-        this.length = 0;
-
         if (array !== undefined) {
             this.addAll(array);
         }

package/src/core/function/FunctionCompiler.js

@@ -4,9 +4,9 @@ import { isArrayEqualStrict } from "../collection/array/isArrayEqualStrict.js";
 import { invokeObjectEquals } from "../model/object/invokeObjectEquals.js";
 import { invokeObjectHash } from "../model/object/invokeObjectHash.js";
 import { computeStringHash } from "../primitives/strings/computeStringHash.js";
-import { computeUTF8StringByteSize } from "../primitives/strings/StringUtils.js";
 import { computeHashArray } from "../collection/array/computeHashArray.js";
 import { computeHashIntegerArray } from "../collection/array/computeHashIntegerArray.js";
+import { string_compute_byte_size } from "../primitives/strings/string_compute_byte_size.js";
 
 /**
  * Hash is an integer value, so this is an invalid value for a computed hash
@@ -62,17 +62,17 @@ class FunctionDefinition {
      */
     computeByteSize() {
 
-        let result = computeUTF8StringByteSize(this.body);
+        let result = string_compute_byte_size(this.body);
 
         if (this.name !== undefined) {
-            result += computeUTF8StringByteSize(this.name);
+            result += string_compute_byte_size(this.name);
         }
 
         const n = this.args.length;
         for (let i = 0; i < n; i++) {
             const arg = this.args[i];
 
-            result += computeUTF8StringByteSize(arg);
+            result += string_compute_byte_size(arg);
         }
 
         return result;

package/src/core/function/Functions.js

@@ -101,22 +101,3 @@ export function chainFunctions(...processes) {
 }
 
 
-/**
- *
- * @param {number} a
- * @param {number} b
- * @return {number}
- */
-export function compareNumbersAscending(a, b) {
-    return a - b;
-}
-
-/**
- *
- * @param {number} a
- * @param {number} b
- * @return {number}
- */
-export function compareNumbersDescending(a, b) {
-    return b - a;
-}

package/src/core/geom/2d/aabb/AABB2.js

@@ -17,7 +17,7 @@ import {
 
 /**
  *
- * Axis-Aligned Bounding Box 2D
+ * Axis-Aligned Bounding Box in 2D
  */
 class AABB2 {
     /**

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

@@ -6,26 +6,25 @@ import { assert } from "../../assert.js";
  * Used for representing points on a 3D surface. Used for raycasting contacts
  */
 export class SurfacePoint3 {
-    constructor() {
-        /**
-         * @readonly
-         * @type {Vector3}
-         */
-        this.normal = new Vector3(0, 1, 0);
-
-        /**
-         * @readonly
-         * @type {Vector3}
-         */
-        this.position = new Vector3(0, 0, 0);
-
-        /**
-         * Primitive index, such as triangle/point/line from the source geometry
-         * optional
-         * @type {number}
-         */
-        this.index = -1;
-    }
+
+    /**
+     * @readonly
+     * @type {Vector3}
+     */
+    normal = new Vector3(0, 1, 0);
+
+    /**
+     * @readonly
+     * @type {Vector3}
+     */
+    position = new Vector3(0, 0, 0);
+
+    /**
+     * Primitive index, such as triangle/point/line from the source geometry
+     * optional
+     * @type {number}
+     */
+    index = -1;
 
     get 0() {
         return this.position.x;
@@ -129,6 +128,17 @@ export class SurfacePoint3 {
         this.normal.writeToArray(array, offset + 3);
     }
 
+    /**
+     *
+     * @param {SurfacePoint3} other
+     * @returns {boolean}
+     */
+    equals(other) {
+        return this.index === other.index
+            && this.position.equals(other.position)
+            && this.normal.equals(other.normal);
+    }
+
     /**
      *
      * @param {SurfacePoint3} other

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

@@ -0,0 +1,116 @@
+import { SurfacePoint3 } from "./SurfacePoint3.js";
+import { MATRIX_4_IDENTITY } from "./matrix/MATRIX_4_IDENTITY.js";
+
+
+test("equals", () => {
+
+    const a = new SurfacePoint3();
+
+    a.position.set(1, 3, 5);
+    a.normal.set(7, 11, 13);
+    a.index = 97;
+
+    const b = new SurfacePoint3();
+
+    expect(a.equals(b)).toBe(false);
+
+    b.index = 97;
+
+    expect(a.equals(b)).toBe(false);
+
+    b.position.set(1, 3, 5);
+
+    expect(a.equals(b)).toBe(false);
+
+    b.normal.set(7, 11, 13);
+
+    expect(a.equals(b)).toBe(true);
+
+    b.index = 91;
+
+    expect(a.equals(b)).toBe(false);
+});
+
+test("copy", () => {
+    const a = new SurfacePoint3();
+
+    a.position.set(1, 3, 5);
+    a.normal.set(7, 11, 13);
+    a.index = 97;
+
+    const b = new SurfacePoint3();
+
+    b.copy(a);
+
+    expect(b.position.x).toBe(1);
+    expect(b.position.y).toBe(3);
+    expect(b.position.z).toBe(5);
+
+    expect(b.normal.x).toBe(7);
+    expect(b.normal.y).toBe(11);
+    expect(b.normal.z).toBe(13);
+
+    expect(b.index).toBe(97);
+});
+
+test("array-style getters", () => {
+
+    const point = new SurfacePoint3();
+
+    point.position.set(1, 3, 5);
+    point.normal.set(7, 11, 13);
+
+    expect(point[0]).toBe(1);
+    expect(point[1]).toBe(3);
+    expect(point[2]).toBe(5);
+
+    expect(point[3]).toBe(7);
+    expect(point[4]).toBe(11);
+    expect(point[5]).toBe(13);
+
+});
+
+test("toArray", () => {
+
+    const point = new SurfacePoint3();
+
+    point.position.set(1, 3, 5);
+    point.normal.set(7, 11, 13);
+
+    const array = [99];
+
+    point.toArray(array, 1);
+
+    expect(array).toEqual([99, 1, 3, 5, 7, 11, 13]);
+});
+
+test("fromArray", () => {
+    const point = new SurfacePoint3();
+
+    point.fromArray([99, 1, 3, 5, 7, 11, 13], 1);
+
+    expect(point.position.x).toBe(1);
+    expect(point.position.y).toBe(3);
+    expect(point.position.z).toBe(5);
+
+    expect(point.normal.x).toBe(7);
+    expect(point.normal.y).toBe(11);
+    expect(point.normal.z).toBe(13);
+
+});
+
+test("applyMatrix4 with identity matrix", () => {
+
+    const original = new SurfacePoint3();
+
+    original.position.set(1, 3, 5);
+    original.normal.set(7, 11, 13);
+
+    original.normal.normalize();
+
+    const transformed = original.clone();
+
+    transformed.applyMatrix4(MATRIX_4_IDENTITY);
+
+    expect(transformed.equals(original)).toBe(true);
+});

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

@@ -15,9 +15,11 @@ import { aabb3_compute_surface_area } from "./aabb3_compute_surface_area.js";
 import { aabb3_intersects_frustum_array } from "./aabb3_intersects_frustum_array.js";
 import { aabb3_matrix4_project } from "./aabb3_matrix4_project.js";
 import { aabb3_signed_distance_sqr_to_point } from "./aabb3_signed_distance_sqr_to_point.js";
-import { aabb3_array_contains_point } from "./aabb3_array_contains_point.js";
-
+import { aabb3_array_intersects_point } from "./aabb3_array_intersects_point.js";
 
+/**
+ * Axis-Aligned bounding box in 3D
+ */
 export class AABB3 {
     /**
      *
@@ -104,14 +106,14 @@ export class AABB3 {
     }
 
     /**
-     * @deprecated use {@link aabb3_array_contains_point} directly
+     * @deprecated use {@link aabb3_array_intersects_point} directly
      * @param {number} x
      * @param {number} y
      * @param {number} z
      * @returns {boolean}
      */
     containsPoint(x, y, z) {
-        return aabb3_array_contains_point(this, x, y, z);
+        return aabb3_array_intersects_point(this, x, y, z);
     }
 
     /**
@@ -249,6 +251,8 @@ export class AABB3 {
      * @param {Number} z1
      */
     setBoundsUnordered(x0, y0, z0, x1, y1, z1) {
+
+        // sort bound coordinates
         let _x0, _y0, _z0, _x1, _y1, _z1;
         if (x0 < x1) {
             _x0 = x0;
@@ -271,7 +275,10 @@ export class AABB3 {
             _z0 = z1;
             _z1 = z0;
         }
+
+        // write sorted
         this.setBounds(_x0, _y0, _z0, _x1, _y1, _z1);
+
     }
 
     setNegativelyInfiniteBounds() {
@@ -291,12 +298,8 @@ export class AABB3 {
      */
     distanceToPoint2(x, y, z) {
         return aabb3_signed_distance_sqr_to_point(
-            this.x0,
-            this.y0,
-            this.z0,
-            this.x1,
-            this.y1,
-            this.z1,
+            this.x0, this.y0, this.z0,
+            this.x1, this.y1, this.z1,
             x, y, z
         );
     }

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

@@ -8,7 +8,10 @@
  * @param {number} z
  * @return {boolean}
  */
-export function aabb3_array_contains_point(aabb, x, y, z) {
+export function aabb3_array_intersects_point(
+    aabb,
+    x, y, z
+) {
     return x >= aabb[0]
         && x <= aabb[3]
         && y >= aabb[1]

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

@@ -1,10 +1,34 @@
+import { assert } from "../../../assert.js";
+
 /**
  *
  * @param {number[]|Float32Array|Float64Array} result
  * @param {{x:number,y:number,z:number}} min
  * @param {{x:number,y:number,z:number}} max
  */
-export function aabb3_from_min_max(result, min, max) {
+export function aabb3_from_min_max(
+    result,
+    min, max
+) {
+    // read out bounds
+    const x0 = min.x;
+    const y0 = min.y;
+    const z0 = min.z;
+
+    const x1 = max.x;
+    const y1 = max.y;
+    const z1 = max.z;
+
+    // validate bounds
+    assert.notNaN(x0, 'x0');
+    assert.notNaN(y0, 'y0');
+    assert.notNaN(z0, 'z0');
+
+    assert.notNaN(x1, 'x1');
+    assert.notNaN(y1, 'y1');
+    assert.notNaN(z1, 'z1');
+
+    // marshal to output
     result[0] = min.x;
     result[1] = min.y;
     result[2] = min.z;

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

@@ -1,4 +1,5 @@
 import { assert } from "../../../assert.js";
+import { aabb3_from_min_max } from "./aabb3_from_min_max.js";
 
 /**
  *
@@ -13,29 +14,5 @@ export function aabb3_from_threejs_geometry(result, geometry) {
     const min = gbb.min;
     const max = gbb.max;
 
-    const x0 = min.x;
-    const y0 = min.y;
-    const z0 = min.z;
-
-    const x1 = max.x;
-    const y1 = max.y;
-    const z1 = max.z;
-
-    // validate bounds
-    assert.notNaN(x0, 'x0');
-    assert.notNaN(y0, 'y0');
-    assert.notNaN(z0, 'z0');
-
-    assert.notNaN(x1, 'x1');
-    assert.notNaN(y1, 'y1');
-    assert.notNaN(z1, 'z1');
-
-    // marshal into transform-accepted format
-    result[0] = x0;
-    result[1] = y0;
-    result[2] = z0;
-
-    result[3] = x1;
-    result[4] = y1;
-    result[5] = z1;
+    aabb3_from_min_max(result, min, max);
 }

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

@@ -13,7 +13,11 @@ import { max2 } from "../../../math/max2.js";
  * @param {number} point_z
  * @returns {number}
  */
-export function aabb3_signed_distance_sqr_to_point(x0, y0, z0, x1, y1, z1, point_x, point_y, point_z) {
+export function aabb3_signed_distance_sqr_to_point(
+    x0, y0, z0,
+    x1, y1, z1,
+    point_x, point_y, point_z
+) {
     //do projection
     const xp0 = x0 - point_x;
     const xp1 = point_x - x1;

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

@@ -8,7 +8,11 @@
  * @param {number} vertex_count
  * @param {mat4|number[]|Float32Array} mat4
  */
-export function apply_mat4_transform_to_direction_v3_array(source, source_offset, destination, destination_offset, vertex_count, mat4) {
+export function apply_mat4_transform_to_direction_v3_array(
+    source, source_offset,
+    destination, destination_offset,
+    vertex_count, mat4
+) {
 
     const a0 = mat4[0];
     const a1 = mat4[1];

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

@@ -8,7 +8,11 @@
  * @param {number} vertex_count
  * @param {mat4|number[]|Float32Array} mat4
  */
-export function apply_mat4_transform_to_v3_array(source, source_offset, destination, destination_offset, vertex_count, mat4) {
+export function apply_mat4_transform_to_v3_array(
+    source, source_offset,
+    destination, destination_offset,
+    vertex_count, mat4
+) {
 
     const a0 = mat4[0];
     const a1 = mat4[1];

package/src/core/geom/3d/tetrahedra/TetrahedralMesh.js

@@ -4,9 +4,9 @@ import { max3 } from "../../../math/max3.js";
 import { assert } from "../../../assert.js";
 import { array_copy } from "../../../collection/array/array_copy.js";
 import { array_quick_sort_by_comparator } from "../../../collection/array/arrayQuickSort.js";
-import { compareNumbersDescending } from "../../../function/Functions.js";
 import { BinaryBuffer } from "../../../binary/BinaryBuffer.js";
 import { Base64 } from "../../../binary/Base64.js";
+import { number_compare_descending } from "../../../primitives/numbers/number_compare_descending.js";
 
 /**
  * @readonly
@@ -546,7 +546,7 @@ export class TetrahedralMesh {
      */
     compact() {
         // sort free
-        array_quick_sort_by_comparator(this.__free, compareNumbersDescending, null, 0, this.__free_pointer - 1);
+        array_quick_sort_by_comparator(this.__free, number_compare_descending, null, 0, this.__free_pointer - 1);
 
         let relocation_count = 0;
         let free_head_pointer = 0;

package/src/core/geom/3d/topology/struct/binary/io/bt_mesh_calc_edges.js

@@ -1,5 +1,5 @@
 import { OrderedEdge } from "./OrderedEdge.js";
-import { HashMap } from "../../../../../../collection/HashMap.js";
+import { HashMap } from "../../../../../../collection/map/HashMap.js";
 
 /**
  * @see https://github.com/blender/blender/blob/9cb061f4f0119e647173e7d354e1457e97632333/source/blender/blenkernel/intern/mesh_calc_edges.cc#L209

package/src/core/geom/3d/triangle/computeTriangleRayIntersectionBarycentric.spec.js

@@ -0,0 +1,26 @@
+import { computeTriangleRayIntersectionBarycentric } from "./computeTriangleRayIntersectionBarycentric.js";
+
+test("orthogonal, through center", () => {
+
+    const result = [];
+
+    const hit_found = computeTriangleRayIntersectionBarycentric(
+        result,
+        0, 0, 3,
+        0, 0, -1,
+        -1, -1, 0,
+        1, -1, 0,
+        1, 1, 0
+    );
+
+    expect(hit_found).toBe(true);
+
+    expect(result[0]).toBeCloseTo(3);
+
+    // note that UVs are just checked for sanity
+    expect(result[1]).toBeGreaterThanOrEqual(0);
+    expect(result[1]).toBeLessThanOrEqual(1);
+
+    expect(result[2]).toBeGreaterThanOrEqual(0);
+    expect(result[2]).toBeLessThanOrEqual(1);
+});

package/src/core/geom/3d/v3_compute_triangle_normal.spec.js

@@ -25,3 +25,21 @@ test("axis aligned triangles on -X plane", () => {
 
     expect(result).toEqual([-1, 0, 0]);
 });
+
+test("degenerate triangle with all points at the same position", () => {
+    const result = [];
+
+    v3_compute_triangle_normal(
+        result, 0,
+        1, 3, 5,
+        1, 3, 5,
+        1, 3, 5,
+    );
+
+    expect(result[0]).not.toBeNaN();
+    expect(result[1]).not.toBeNaN();
+    expect(result[2]).not.toBeNaN();
+
+    // normal vector length should be 1
+    expect(Math.hypot(result[0], result[1], result[2])).toBeCloseTo(1);
+});

package/src/core/geom/Vector2.js

@@ -581,7 +581,7 @@ class Vector2 {
     }
 
     toString() {
-        return `Vector2{x:${this.x}, y:${this.y}}`;
+        return `Vector2{ x:${this.x}, y:${this.y} }`;
     }
 
     /**

package/src/core/geom/Vector3.js

@@ -806,7 +806,7 @@ class Vector3 {
     }
 
     toString() {
-        return `{ x:${this.x}, y:${this.y}, z:${this.z} }`;
+        return `Vector3{ x:${this.x}, y:${this.y}, z:${this.z} }`;
     }
 
     /**

package/src/core/geom/packing/miniball/Miniball.spec.js

@@ -1,6 +1,13 @@
 import { Miniball } from "./Miniball.js";
 import { PointSet } from "./PointSet.js";
 
+
+test("empty point set in 1d", () => {
+
+    new Miniball(new PointSet(0, 1, []));
+
+});
+
 test("single point in 1d", () => {
 
     const miniball = new Miniball(new PointSet(1, 1, [7]));
@@ -9,3 +16,20 @@ test("single point in 1d", () => {
     expect(miniball.radius()).toEqual(0);
 
 });
+
+test("3 points in 1d", () => {
+    const miniball = new Miniball(new PointSet(3, 1, [-3, 7, 11]));
+
+    expect(miniball.center()[0]).toBeCloseTo(4);
+    expect(miniball.radius()).toBeCloseTo(7);
+});
+
+test("toString produces a valid string", () => {
+
+    const miniball = new Miniball(new PointSet(1, 1, [7]));
+
+    const s = miniball.toString();
+
+    expect(typeof s).toBe("string");
+    expect(s.trim().length).toBeGreaterThan(0);
+});

package/src/core/math/statistics/computeStatisticalPartialMedian.js

@@ -1,5 +1,5 @@
-import { compareNumbersAscending } from "../../function/Functions.js";
 import { assert } from "../../assert.js";
+import { number_compare_ascending } from "../../primitives/numbers/number_compare_ascending.js";
 
 /**
  *
@@ -14,7 +14,7 @@ export function computeStatisticalPartialMedian(values, start, end) {
 
     const copy = values.slice();
 
-    copy.sort(compareNumbersAscending);
+    copy.sort(number_compare_ascending);
 
     const range = end - start;