@woosh/meep-engine 2.54.0 → 2.55.0

package/package.json

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

package/src/core/__module.js

@@ -1,6 +1,6 @@
 
 export { Cache } from "./cache/Cache.js";
-export { HashMap } from "./collection/HashMap.js";
+export { HashMap } from "./collection/map/HashMap.js";
 
 export * from "./geom/Vector3.js";
 export * from "./geom/Vector4.js";

package/src/core/cache/Cache.js

@@ -1,5 +1,5 @@
 import { assert } from "../assert.js";
-import { HashMap } from "../collection/HashMap.js";
+import { HashMap } from "../collection/map/HashMap.js";
 import Signal from "../events/signal/Signal.js";
 import { returnOne, returnZero, strictEquals } from "../function/Functions.js";
 import { CacheElement } from "./CacheElement.js";

package/src/core/collection/Stack.js

@@ -5,23 +5,20 @@ import Signal from "../events/signal/Signal.js";
  * @class
  */
 export class Stack {
+
     /**
-     * @template T
+     * @private
+     * @type {T[]}
      */
-    constructor() {
-
-        /**
-         * @private
-         * @type {T[]}
-         */
-        this.data = [];
-
-        this.on = {
-            removed: new Signal(),
-            added: new Signal()
-        };
+    data = [];
 
-    }
+    /**
+     * @readonly
+     */
+    on = {
+        removed: new Signal(),
+        added: new Signal()
+    };
 
     /**
      * @returns {T[]}

package/src/core/collection/array/array_contains_duplicates.js

@@ -11,12 +11,15 @@ export function array_contains_duplicates(
     end_index = source.length - 1
 ) {
 
-    for (let k = start_index; k <= end_index; k++) {
+    // going to n-1, as we check all elements forward from the current
+    const last = end_index - 1;
+
+    for (let k = start_index; k <= last; k++) {
 
         const element = source[k];
 
         // look for future occurrences of the same element
-        if (source.indexOf(element, k + 1) === -1) {
+        if (source.indexOf(element, k + 1) !== -1) {
             return true;
         }
 

package/src/core/collection/array/array_contains_duplicates.spec.js

@@ -0,0 +1,14 @@
+import { array_contains_duplicates } from "./array_contains_duplicates.js";
+
+test("basics", () => {
+    expect(array_contains_duplicates([])).toBe(false);
+
+    expect(array_contains_duplicates([1])).toBe(false);
+
+    expect(array_contains_duplicates([1, 2, 3])).toBe(false);
+
+    expect(array_contains_duplicates([1, 1])).toBe(true);
+    expect(array_contains_duplicates([0, 1, 1])).toBe(true);
+    expect(array_contains_duplicates([1, 0, 1])).toBe(true);
+    expect(array_contains_duplicates([1, 1, 0])).toBe(true);
+});

package/src/core/collection/array/array_copy_entire.js

@@ -1,3 +1,6 @@
+import { array_copy } from "./array_copy.js";
+import { array_shrink_to_size } from "./array_shrink_to_size.js";
+
 /**
  * @template T
  * @param {T[]} source
@@ -5,17 +8,9 @@
  */
 export function array_copy_entire(source, target) {
 
-    const n = source.length;
-    for (let i = 0; i < n; i++) {
-        const v = source[i];
-
-        target[i] = v;
-    }
-
+    const source_length = source.length;
 
-    const tL = target.length;
+    array_copy(source, 0, target, 0, source_length);
+    array_shrink_to_size(target, source_length);
 
-    if (n > tL) {
-        target.splice(n, tL - n);
-    }
 }

package/src/core/collection/array/array_get_index_in_range.js

@@ -1,3 +1,5 @@
+import { assert } from "../../assert.js";
+
 /**
  * @template T
  * @param {T[]} array
@@ -6,6 +8,9 @@
  * @param {number} max_index
  */
 export function array_get_index_in_range(array, needle, min_index, max_index) {
+    assert.lessThanOrEqual(max_index, array.length - 1, 'max_length must is too large');
+    assert.isNonNegativeInteger(min_index, 'min_index');
+
     for (let i = min_index; i <= max_index; i++) {
         if (array[i] === needle) {
             return i;

package/src/core/collection/array/array_get_index_in_range.spec.js

@@ -0,0 +1,16 @@
+import { array_get_index_in_range } from "./array_get_index_in_range.js";
+
+test("basics", () => {
+
+    expect(array_get_index_in_range([], 1, 0, -1)).toBe(-1);
+    expect(array_get_index_in_range([1], 1, 0, 0)).toBe(0);
+
+    expect(array_get_index_in_range([3, 1], 1, 0, 1)).toBe(1);
+    expect(array_get_index_in_range([3, 1], 1, 0, 0)).toBe(-1);
+    expect(array_get_index_in_range([3, 1], 1, 1, 1)).toBe(1);
+
+    expect(array_get_index_in_range([1, 3], 1, 0, 1)).toBe(0);
+    expect(array_get_index_in_range([1, 3], 1, 1, 1)).toBe(-1);
+    expect(array_get_index_in_range([1, 3], 1, 0, 0)).toBe(0);
+
+});

package/src/core/collection/array/groupArrayBy.js

@@ -1,5 +1,5 @@
 import { returnZero } from "../../function/Functions.js";
-import { HashMap } from "../HashMap.js";
+import { HashMap } from "../map/HashMap.js";
 
 /**
  * @template T,K

package/src/core/collection/array/isArrayEqual.js

@@ -8,7 +8,10 @@ export function isArrayEqual(first, second) {
 
     const il = first.length;
 
-    if (il !== second.length) return false;
+    if (il !== second.length) {
+        // arrays are of different size
+        return false;
+    }
 
     let i = 0;
 

package/src/core/collection/array/randomizeArrayElementOrder.js

@@ -2,6 +2,7 @@ import { randomIntegerBetween } from "../../math/random/randomIntegerBetween.js"
 import { arraySwapElements } from "./arraySwapElements.js";
 
 /**
+ * Randomly re-orders of items in-place
  * @template T
  * @param {function} random
  * @param {T[]} array

package/src/core/collection/array/randomizeArrayElementOrder.spec.js

@@ -0,0 +1,27 @@
+import { randomizeArrayElementOrder } from "./randomizeArrayElementOrder.js";
+
+test("sanity", () => {
+
+    const random = () => 0;
+
+    const a = [];
+
+    randomizeArrayElementOrder(random, a);
+
+    expect(a).toEqual([]);
+
+    const b = [1];
+
+    randomizeArrayElementOrder(random, b);
+
+    expect(b).toEqual([1]);
+
+    const c = [1, 2, 3];
+
+    randomizeArrayElementOrder(random, c);
+
+    expect(c.length).toBe(3);
+    expect(c).toContain(1);
+    expect(c).toContain(2);
+    expect(c).toContain(3);
+});

package/src/core/collection/heap/Uin32Heap.spec.js

@@ -57,3 +57,67 @@ test('insert 5 out of order, retrieve in order', () => {
     expect(heap.pop_min()).toBe(3);
     expect(heap.pop_min()).toBe(5);
 });
+
+test("remove", () => {
+
+    const heap = new Uint32Heap();
+
+    expect(heap.remove(7)).toBe(false);
+
+    heap.insert(7, 3);
+
+    expect(heap.remove(7)).toBe(true);
+
+    expect(heap.is_empty()).toBe(true);
+});
+
+test("is_empty", () => {
+
+    const heap = new Uint32Heap();
+
+    expect(heap.is_empty()).toBe(true);
+
+    heap.insert(7, 0);
+
+    expect(heap.is_empty()).toBe(false);
+});
+
+test("update_score", () => {
+
+    const heap = new Uint32Heap();
+
+    heap.insert(1, 3);
+    heap.insert(7, 11);
+
+    heap.update_score(7, -1);
+
+    expect(heap.pop_min()).toEqual(7);
+    expect(heap.pop_min()).toEqual(1);
+});
+
+test("get_score", () => {
+
+    const heap = new Uint32Heap();
+
+    expect(heap.get_score(7)).toBeNaN();
+
+    heap.insert(7, 31);
+
+    expect(heap.get_score(7)).toBe(31);
+});
+
+test("insert_or_update", () => {
+
+    const heap = new Uint32Heap();
+
+    heap.insert_or_update(7, 1);
+
+    expect(heap.size).toBe(1);
+    expect(heap.get_score(7)).toBe(1);
+
+    heap.insert_or_update(7, 17);
+
+    expect(heap.size).toBe(1);
+    expect(heap.get_score(7)).toBe(17);
+
+});

package/src/core/collection/heap/Uint32Heap.js

@@ -279,13 +279,17 @@ export class Uint32Heap {
     /**
      *
      * @param {number} id
+     * @returns {boolean}
      */
     remove(id) {
         const i = this.find_index_by_id(id);
 
-        if (i !== -1) {
-            this.__remove_by_index(i);
+        if (i === -1) {
+            return false;
         }
+
+        this.__remove_by_index(i);
+        return true;
     }
 
     /**

package/src/core/collection/list/List.js

@@ -920,6 +920,7 @@ class List {
         const l = this.length;
 
         const other_length = other.length;
+
         if (l !== other_length) {
             return l - other_length;
         }

package/src/core/collection/{HashMap.js → map/HashMap.js}

@@ -1,13 +1,13 @@
-import { assert } from "../assert.js";
-import { invokeObjectEquals } from "../model/object/invokeObjectEquals.js";
-import { invokeObjectHash } from "../model/object/invokeObjectHash.js";
-import { isPowerOfTwo } from "../math/isPowerOrTwo.js";
-import { ctz32 } from "../binary/ctz32.js";
-import { ceilPowerOfTwo } from "../binary/operations/ceilPowerOfTwo.js";
-import { UintArrayForCount } from "./array/typed/uint_array_for_count.js";
-import { array_copy } from "./array/array_copy.js";
-import { min2 } from "../math/min2.js";
-import { arraySwapElements } from "./array/arraySwapElements.js";
+import { assert } from "../../assert.js";
+import { invokeObjectEquals } from "../../model/object/invokeObjectEquals.js";
+import { invokeObjectHash } from "../../model/object/invokeObjectHash.js";
+import { isPowerOfTwo } from "../../math/isPowerOrTwo.js";
+import { ctz32 } from "../../binary/ctz32.js";
+import { ceilPowerOfTwo } from "../../binary/operations/ceilPowerOfTwo.js";
+import { UintArrayForCount } from "../array/typed/uint_array_for_count.js";
+import { array_copy } from "../array/array_copy.js";
+import { min2 } from "../../math/min2.js";
+import { arraySwapElements } from "../array/arraySwapElements.js";
 
 /*
  * Heavily inspired by ruby's "new" (circa 2016) hash table implementation

package/src/core/collection/{HashMap.spec.js → map/HashMap.spec.js}

@@ -1,5 +1,5 @@
 import { generate_next_linear_congruential_index, HashMap } from "./HashMap.js";
-import { passThrough, returnOne, strictEquals } from "../function/Functions.js";
+import { passThrough, returnOne, strictEquals } from "../../function/Functions.js";
 
 /**
  *

package/src/core/collection/{ObservedMap.js → map/ObservedMap.js}

@@ -1,4 +1,4 @@
-import Signal from "../events/signal/Signal.js";
+import Signal from "../../events/signal/Signal.js";
 
 export class ObservedMap {
     /**

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/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/aabb/AABB3.js

@@ -17,7 +17,9 @@ 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";
 
-
+/**
+ * Axis-Aligned bounding box in 3D
+ */
 export class AABB3 {
     /**
      *

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/model/ObservedInteger.js

@@ -2,17 +2,24 @@ import { assert } from "../assert.js";
 import Signal from "../events/signal/Signal.js";
 
 class ObservedInteger extends Number {
+    /**
+     * @readonly
+     * @type {Signal}
+     */
+    onChanged = new Signal();
+
     /**
      *
-     * @param {Number} value
+     * @param {Number} [value]
      * @constructor
      */
-    constructor(value) {
+    constructor(value = 0) {
         super();
 
-        assert.equal(typeof value, "number", `Value must be of type "number", instead was "${typeof value}"`);
+        assert.isNumber(value, 'value');
         assert.ok(Number.isInteger(value) || !Number.isFinite(value), `Value must be an integer, instead was ${value}`);
 
+
         /**
          *
          * @type {Number}
@@ -20,7 +27,6 @@ class ObservedInteger extends Number {
          */
         this.__value = value;
 
-        this.onChanged = new Signal();
     }
 
     /**
@@ -41,7 +47,7 @@ class ObservedInteger extends Number {
      * @returns {ObservedInteger}
      */
     set(value) {
-        assert.equal(typeof value, "number", `Value must be of type "number", instead was "${typeof value}"`);
+        assert.isNumber(value, 'value');
         assert.ok(Number.isInteger(value) || !Number.isFinite(value), `Value must be an integer, instead was ${value}`);
 
         const oldValue = this.__value;
@@ -58,8 +64,7 @@ class ObservedInteger extends Number {
      * @param {number} value
      */
     setSilent(value) {
-
-        assert.equal(typeof value, "number", `Value must be of type "number", instead was "${typeof value}"`);
+        assert.isNumber(value, 'value');
         assert.ok(Number.isInteger(value) || !Number.isFinite(value), `Value must be an integer, instead was ${value}`);
 
         this.__value = value;

package/src/core/model/ObservedString.js

@@ -10,13 +10,13 @@ import { computeStringHash } from "../primitives/strings/computeStringHash.js";
 class ObservedString extends String {
     /**
      *
-     * @param {String} value
+     * @param {String} [value]
      * @constructor
      */
-    constructor(value) {
+    constructor(value = "") {
         super();
 
-        assert.equal(typeof value, "string", `Value must be of type "string", instead was "${typeof value}"`);
+        assert.isString(value, 'value');
 
         /**
          *
@@ -26,11 +26,6 @@ class ObservedString extends String {
         this.__value = value;
 
         this.onChanged = new Signal();
-        /**
-         * Used for optimized "instanceof" check
-         * @type {boolean}
-         */
-        this.isObservedString = true;
     }
 
     /**
@@ -133,4 +128,11 @@ class ObservedString extends String {
     }
 }
 
+/**
+ * Used for optimized "instanceof" check
+ * @readonly
+ * @type {boolean}
+ */
+ObservedString.prototype.isObservedString = true;
+
 export default ObservedString;

package/src/core/model/node-graph/visual/NodeGraphVisualData.js

@@ -1,5 +1,5 @@
 import { assert } from "../../../assert.js";
-import { HashMap } from "../../../collection/HashMap.js";
+import { HashMap } from "../../../collection/map/HashMap.js";
 import { Color } from "../../../color/Color.js";
 import { BoxLayoutSpec } from "./layout/BoxLayoutSpec.js";
 import { ConnectedBoxLayouter } from "./layout/ConnectedBoxLayouter.js";

package/src/core/model/object/ImmutableObjectPool.js

@@ -1,5 +1,5 @@
 import { CacheElement } from "../../cache/CacheElement.js";
-import { HashMap } from "../../collection/HashMap.js";
+import { HashMap } from "../../collection/map/HashMap.js";
 
 /**
  * @template Key, Value

package/src/core/model/reactive/evaluation/MultiPredicateEvaluator.js

@@ -1,6 +1,6 @@
 import { assert } from "../../../assert.js";
 import { BitSet } from "../../../binary/BitSet.js";
-import { HashMap } from "../../../collection/HashMap.js";
+import { HashMap } from "../../../collection/map/HashMap.js";
 import { max2 } from "../../../math/max2.js";
 import DataType from "../../../parser/simple/DataType.js";
 

package/src/engine/asset/AssetManager.js

@@ -3,11 +3,11 @@
  */
 
 
-import { ObservedMap } from "../../core/collection/ObservedMap.js";
-import { HashMap } from "../../core/collection/HashMap.js";
+import { ObservedMap } from "../../core/collection/map/ObservedMap.js";
+import { HashMap } from "../../core/collection/map/HashMap.js";
 import { extractAssetListFromManager } from "./preloader/extractAssetListFromManager.js";
 import { assert } from "../../core/assert.js";
-import { HashSet } from "../../core/collection/HashSet.js";
+import { HashSet } from "../../core/collection/set/HashSet.js";
 import { CrossOriginConfig } from "./CORS/CrossOriginConfig.js";
 import { array_remove_element } from "../../core/collection/array/array_remove_element.js";
 import { AssetDescription } from "./AssetDescription.js";

package/src/engine/asset/loaders/GLTFAssetLoader.js

@@ -20,7 +20,7 @@ import { CrossOriginKind } from "../CORS/CrossOriginKind.js";
 import { computeObjectBoundingSphere } from "./gltf/computeObjectBoundingSphere.js";
 import { isMesh } from "./gltf/isMesh.js";
 import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader.js";
-import { HashSet } from "../../../core/collection/HashSet.js";
+import { HashSet } from "../../../core/collection/set/HashSet.js";
 import { computeGeometryHash } from "../../graphics/geometry/buffered/computeGeometryHash.js";
 import { computeGeometryEquality } from "../../graphics/geometry/buffered/computeGeometryEquality.js";
 import { traverseThreeObject } from "../../graphics/ecs/highlight/renderer/traverseThreeObject.js";

package/src/engine/ecs/EntityBlueprint.js

@@ -59,13 +59,11 @@ function populateJsonTemplate(template, seed) {
  * @class
  */
 export class EntityBlueprint {
-    constructor() {
-        /**
-         *
-         * @type {Map<Class, Object>}
-         */
-        this.componentnts = new Map();
-    }
+    /**
+     * @private
+     * @type {Map<Class, Object>}
+     */
+    #components = new Map();
 
     /**
      *
@@ -95,7 +93,7 @@ export class EntityBlueprint {
     }
 
     clear() {
-        this.componentnts.clear();
+        this.#components.clear();
     }
 
     /**
@@ -104,7 +102,7 @@ export class EntityBlueprint {
      * @param {Object} json
      */
     addJSON(klass, json) {
-        this.componentnts.set(klass, json);
+        this.#components.set(klass, json);
     }
 
     /**
@@ -148,7 +146,7 @@ export class EntityBlueprint {
     build(templateSeed) {
         const eb = new EntityBuilder();
 
-        this.componentnts.forEach((template, ComponentClass) => {
+        this.#components.forEach((template, ComponentClass) => {
             const component = new ComponentClass();
 
             const json = populateJsonTemplate(template, templateSeed);