@woosh/meep-engine 2.84.3 → 2.84.5

package/build/meep.module.js

@@ -63964,7 +63964,7 @@ Task.prototype.isTask = true;
 /**
  *
  * @param {number|function(*):number} initial
- * @param {number|function(*):number} limit
+ * @param {number|function(*):number} limit limit is excluded from the count, same as `for(;i < limit;)`
  * @param {function(index:int)} callback
  * @returns {Task}
  */
@@ -69662,6 +69662,36 @@ function array_remove_first(array, element, start_index = 0, length = array.leng
     return false;
 }
 
+/**
+ *
+ * @param {*} value
+ * @return {boolean}
+ */
+function isDefined(value) {
+    return value !== undefined;
+}
+
+/**
+ *
+ * @enum
+ */
+const EntityFlags = {
+    /**
+     * Whether the entity is built, set internally
+     */
+    Built: 1,
+    /**
+     * If component type is not registered on the {@link EntityComponentDataset} when calling {@link Entity#build} - will register the component first
+     */
+    RegisterComponents: 2,
+    /**
+     * Entity builder will watch destruction of the entity (subscribe to event), this will make the {@link Entity} automatically
+     * recognize when the corresponding entity is destroyed outside the {@link Entity} API
+     * NOTE: useful to turn off to save a bit of memory, as those event listeners take up a bit of space. Feel free to turn this flag off when you don't care to keep the reference to the {@link Entity}
+     */
+    WatchDestruction: 4
+};
+
 /**
  * de Bruijn sequence
  * @see https://graphics.stanford.edu/~seander/bithacks.html
@@ -72274,78 +72304,6 @@ class EntityManager {
     }
 }
 
-/**
- * @author Alex Goldring
- * @copyright Alex Goldring 2017
- */
-
-
-/**
- *
- * @param {*} value
- * @return {boolean}
- */
-function isDefined(value) {
-    return value !== undefined;
-}
-
-/**
- * performs instanceof match
- * @param {function} type
- * @returns {function(*): boolean}
- */
-function isInstanceOf$1(type) {
-    return function (m) {
-        return m instanceof type;
-    }
-}
-
-/**
- * performs typeof match
- * @param {string} type
- * @returns {function(*): boolean}
- */
-function isTypeOf(type) {
-
-    return function (m) {
-        return typeof m === type;
-    }
-}
-
-/**
- * Joins two matchers via OR
- * @param {function(*):boolean} a
- * @param {function(*):boolean} b
- * @returns {function(*):boolean}
- */
-function or(a, b) {
-
-    return function (m) {
-        return a(m) || b(m);
-    }
-}
-
-/**
- *
- * @enum
- */
-const EntityFlags = {
-    /**
-     * Whether the entity is built, set internally
-     */
-    Built: 1,
-    /**
-     * If component type is not registered on the {@link EntityComponentDataset} when calling {@link Entity#build} - will register the component first
-     */
-    RegisterComponents: 2,
-    /**
-     * Entity builder will watch destruction of the entity (subscribe to event), this will make the {@link Entity} automatically
-     * recognize when the corresponding entity is destroyed outside the {@link Entity} API
-     * NOTE: useful to turn off to save a bit of memory, as those event listeners take up a bit of space. Feel free to turn this flag off when you don't care to keep the reference to the {@link Entity}
-     */
-    WatchDestruction: 4
-};
-
 /**
  * Set of default flags
  * @type {number}
@@ -72544,6 +72502,7 @@ class Entity {
      * @returns {*|null}
      */
     removeComponent(klass) {
+
         const elements = this.components;
         const n = elements.length;
 
@@ -72669,6 +72628,7 @@ class Entity {
             dataset.removeEntity(entity);
 
             this.id = -1;
+            this.generation = -1;
 
             this.clearFlag(EntityFlags.Built);
 
@@ -72694,6 +72654,7 @@ class Entity {
         }
 
         const entity = this.id = dataset.createEntity();
+        this.generation = dataset.getEntityGeneration(entity);
         this.dataset = dataset;
 
         let i;
@@ -72751,6 +72712,7 @@ class Entity {
         r.setFlag(EntityFlags.Built);
         r.id = entity;
         r.dataset = dataset;
+        r.generation = dataset.getEntityGeneration(entity);
 
         return r;
     }
@@ -84092,7 +84054,13 @@ class AssetDescription {
     toString() {
         return `{ type: '${this.type}', path: '${this.path}' }`;
     }
-}
+}
+
+/**
+ * @readonly
+ * @type {boolean}
+ */
+AssetDescription.prototype.isAssetDescription = true;
 
 /**
  * @enum {number}
@@ -89823,7 +89791,7 @@ class InputDeviceSwitch {
  * @param klass
  * @returns {boolean}
  */
-function isInstanceOf(thing, klass) {
+function isInstanceOf$1(thing, klass) {
     if (klass === undefined) {
         return false;
     }
@@ -89844,12 +89812,12 @@ function isInstanceOf(thing, klass) {
  * @param {Element} el
  */
 function isFocusable(el) {
-    return isInstanceOf(el, HTMLInputElement)
-        || isInstanceOf(el, HTMLSelectElement)
-        || isInstanceOf(el, HTMLTextAreaElement)
-        || isInstanceOf(el, HTMLAnchorElement)
-        || isInstanceOf(el, HTMLButtonElement)
-        || isInstanceOf(el, HTMLAreaElement)
+    return isInstanceOf$1(el, HTMLInputElement)
+        || isInstanceOf$1(el, HTMLSelectElement)
+        || isInstanceOf$1(el, HTMLTextAreaElement)
+        || isInstanceOf$1(el, HTMLAnchorElement)
+        || isInstanceOf$1(el, HTMLButtonElement)
+        || isInstanceOf$1(el, HTMLAreaElement)
 }
 
 /**
@@ -92402,6 +92370,15 @@ class EntityComponentDataset {
      * @type {BitSet}
      */
     entityOccupancy = new BitSet();
+
+    /**
+     * For each entity ID records generation when entity was created
+     * Values are invalid for unused entity IDs
+     * @private
+     * @type {Uint32Array}
+     */
+    entityGeneration = new Uint32Array(0);
+
     /**
      * @private
      * @type {BitSet}
@@ -92453,7 +92430,7 @@ class EntityComponentDataset {
 
     /**
      * @readonly
-     * @type {Signal}
+     * @type {Signal<number>}
      */
     onEntityCreated = new Signal();
 
@@ -93003,38 +92980,79 @@ class EntityComponentDataset {
 
     /**
      *
-     * @returns {number} entityIndex
+     * @param {number} min_size
      */
-    createEntity() {
-        const entityIndex = this.entityOccupancy.nextClearBit(0);
-        this.entityOccupancy.set(entityIndex, true);
+    enlargeGenerationTable(min_size) {
+        const old_generation_table_size = this.entityGeneration.length;
 
-        this.entityCount++;
+        const new_size = max3(
+            min_size,
+            Math.ceil(old_generation_table_size * 1.2),
+            old_generation_table_size + 16
+        );
 
-        this.onEntityCreated.send1(entityIndex);
+        const new_generation_table = new Uint32Array(new_size);
 
-        this.generation++;
+        new_generation_table.set(this.entityGeneration);
 
-        return entityIndex;
+        this.entityGeneration = new_generation_table;
     }
 
     /**
-     *
-     * @param {number} entityIndex
-     * @throws {Error} if entity index is already in use
+     * Produces generation ID for a given entity
+     * @param {number} entity_id
+     * @returns {number}
      */
-    createEntitySpecific(entityIndex) {
-        if (this.entityExists(entityIndex)) {
-            throw new Error(`EntityId ${entityIndex} is already in use`);
+    getEntityGeneration(entity_id) {
+        return this.entityGeneration[entity_id];
+    }
+
+    /**
+     * @private
+     * @param {number} entity_id
+     */
+    createEntityUnsafe(entity_id) {
+        this.entityOccupancy.set(entity_id, true);
+
+        // record entity generation
+        if (this.entityGeneration.length <= entity_id) {
+            // needs to be resized
+            this.enlargeGenerationTable(entity_id + 1);
         }
 
-        this.entityOccupancy.set(entityIndex, true);
+        const current_generation = this.generation;
+        this.generation = current_generation + 1;
+
+        this.entityGeneration[entity_id] = current_generation;
 
         this.entityCount++;
 
-        this.onEntityCreated.send1(entityIndex);
+        this.onEntityCreated.send1(entity_id);
+    }
 
-        this.generation++;
+    /**
+     *
+     * @returns {number} entityIndex
+     */
+    createEntity() {
+        const entity_id = this.entityOccupancy.nextClearBit(0);
+
+        this.createEntityUnsafe(entity_id);
+
+        return entity_id;
+    }
+
+    /**
+     *
+     * @param {number} entity_id
+     * @throws {Error} if entity index is already in use
+     */
+    createEntitySpecific(entity_id) {
+        if (this.entityExists(entity_id)) {
+            throw new Error(`EntityId ${entity_id} is already in use`);
+        }
+
+        this.createEntityUnsafe(entity_id);
     }
 
     /**
@@ -93159,7 +93177,7 @@ class EntityComponentDataset {
         const componentClass = this.componentTypeMap[componentIndex];
 
         //dispatch event to components
-        this.sendEvent(entityIndex, EventType.ComponentRemoved, {klass: componentClass, instance: componentInstance});
+        this.sendEvent(entityIndex, EventType.ComponentRemoved, { klass: componentClass, instance: componentInstance });
     }
 
     /**
@@ -93260,7 +93278,7 @@ class EntityComponentDataset {
         const componentClass = this.componentTypeMap[componentIndex];
 
         //dispatch event to components
-        this.sendEvent(entityIndex, EventType.ComponentAdded, {klass: componentClass, instance: componentInstance});
+        this.sendEvent(entityIndex, EventType.ComponentAdded, { klass: componentClass, instance: componentInstance });
     }
 
     /**
@@ -96121,6 +96139,42 @@ function number_pretty_print(value) {
 
 }
 
+/**
+ * performs instanceof match
+ * @param {function} type
+ * @returns {function(*): boolean}
+ */
+function isInstanceOf(type) {
+    return function (m) {
+        return m instanceof type;
+    }
+}
+
+/**
+ * performs typeof match
+ * @param {string} type
+ * @returns {function(*): boolean}
+ */
+function isTypeOf(type) {
+
+    return function (m) {
+        return typeof m === type;
+    }
+}
+
+/**
+ * Joins two matchers via OR
+ * @param {function(*):boolean} a
+ * @param {function(*):boolean} b
+ * @returns {function(*):boolean}
+ */
+function or(a, b) {
+
+    return function (m) {
+        return a(m) || b(m);
+    }
+}
+
 /**
  * Created by Alex on 01/11/2014.
  * @copyright Alex Goldring 2014
@@ -96269,14 +96323,14 @@ function p(m, e, f) {
  * @type {Array.<ValueProcessor>}
  */
 const processors = [
-    p(isInstanceOf$1(ObservedBoolean), extractorGetValue, format),
-    p(isInstanceOf$1(ObservedValue), extractorGetValue, format),
-    p(isInstanceOf$1(ObservedString), extractorGetValue, format),
-    p(isInstanceOf$1(LinearValue), extractorGetValue, formatNumber),
-    p(isInstanceOf$1(BoundedValue), extractBoundedValue, formatArray),
-    p(isInstanceOf$1(Stat), extractorGetValue, formatNumber),
-    p(isInstanceOf$1(Vector1), extractorGetValue, formatNumber),
-    p(isInstanceOf$1(ObservedInteger), extractorGetValue, formatNumber),
+    p(isInstanceOf(ObservedBoolean), extractorGetValue, format),
+    p(isInstanceOf(ObservedValue), extractorGetValue, format),
+    p(isInstanceOf(ObservedString), extractorGetValue, format),
+    p(isInstanceOf(LinearValue), extractorGetValue, formatNumber),
+    p(isInstanceOf(BoundedValue), extractBoundedValue, formatArray),
+    p(isInstanceOf(Stat), extractorGetValue, formatNumber),
+    p(isInstanceOf(Vector1), extractorGetValue, formatNumber),
+    p(isInstanceOf(ObservedInteger), extractorGetValue, formatNumber),
     p(or(isTypedArray, Array.isArray), arrayUnwrap, formatArray),
     p(isTypeOf("number"), passThrough, formatNumber),
     p(isTypeOf("string"), passThrough, passThrough),

package/editor/view/ecs/EntityEditor.js

@@ -1,22 +1,21 @@
 /**
  * Created by Alex on 15/01/2017.
  */
-import View from "../../../src/view/View.js";
-import dom from "../../../src/view/DOM.js";
-
 import List from '../../../src/core/collection/list/List.js';
 import ObservedValue from '../../../src/core/model/ObservedValue.js';
+import { isDefined } from "../../../src/core/process/matcher/isDefined.js";
+import { EntityManager, EventType } from "../../../src/engine/ecs/EntityManager.js";
 import LabelView from '../../../src/view/common/LabelView.js';
+import dom from "../../../src/view/DOM.js";
 import ButtonView from '../../../src/view/elements/button/ButtonView.js';
 import DropDownSelectionView from '../../../src/view/elements/DropDownSelectionView.js';
 import EmptyView from "../../../src/view/elements/EmptyView.js";
-import { EntityManager, EventType } from "../../../src/engine/ecs/EntityManager.js";
-import ComponentRemoveAction from "../../actions/concrete/ComponentRemoveAction.js";
+import View from "../../../src/view/View.js";
 import ComponentAddAction from "../../actions/concrete/ComponentAddAction.js";
-import { LineView } from "./components/common/LineView.js";
-import { ComponentControlView } from "./ComponentControlView.js";
+import ComponentRemoveAction from "../../actions/concrete/ComponentRemoveAction.js";
 import { buildObjectEditorFromRegistry } from "../../ecs/component/createObjectEditor.js";
-import { isDefined } from "../../../src/core/process/matcher/Matchers.js";
+import { ComponentControlView } from "./ComponentControlView.js";
+import { LineView } from "./components/common/LineView.js";
 
 
 class EntityEditor extends View {

package/package.json

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

package/src/core/math/random/roundFair.js

@@ -5,11 +5,14 @@
  * @returns {int}
  */
 export function roundFair(number, random) {
+
     const mantissa = number % 1;
     const roll = random();
+
     if (roll < mantissa) {
-        return Math.ceil(number);
-    } else {
         return Math.floor(number);
+    } else {
+        return Math.ceil(number);
     }
+
 }

package/src/core/math/random/roundFair.spec.js

@@ -0,0 +1,12 @@
+import { roundFair } from "./roundFair.js";
+
+test("basics", () => {
+
+    expect(roundFair(0.3, () => 0)).toEqual(0);
+    expect(roundFair(0.3, () => 0.1)).toEqual(0);
+    expect(roundFair(0.3, () => 0.299)).toEqual(0);
+    expect(roundFair(0.3, () => 0.31)).toEqual(1);
+    expect(roundFair(0.3, () => 0.9)).toEqual(1);
+    expect(roundFair(0.3, () => 1)).toEqual(1);
+
+});

package/src/core/math/random/seededRandom_Mulberry32.spec.js

@@ -0,0 +1,19 @@
+import { seededRandom_Mulberry32 } from "./seededRandom_Mulberry32.js";
+
+test("predictable sequence", () => {
+
+    const random = seededRandom_Mulberry32(1337);
+
+    const seq_a = new Array(29).map(random);
+
+    const seed_a = random.getCurrentSeed();
+
+    random.setCurrentSeed(1337);
+
+    const seq_b = new Array(29).map(random);
+
+    const seed_b = random.getCurrentSeed();
+
+    expect(seq_b).toEqual(seq_a);
+    expect(seed_a).toEqual(seed_b);
+});

package/src/core/model/node-graph/node/NodeInstancePortReference.spec.js

@@ -49,8 +49,12 @@ test("incoming connections", () => {
     expect(port_b_ref.inConnections).toEqual([connection]);
 });
 
-test("hash", () => {
 
+/**
+ *
+ * @returns {NodeInstancePortReference}
+ */
+function sample_a() {
     const nd = new NodeDescription();
     const port_a_id = nd.createPort(DUMMY_TYPE, "a", PortDirection.Out);
 
@@ -58,9 +62,28 @@ test("hash", () => {
     const graph = new NodeGraph();
     const node_instance_id = graph.createNode(nd);
 
-    const port_a_ref = graph.getConnectionEndpoint(node_instance_id, port_a_id);
+    return graph.getConnectionEndpoint(node_instance_id, port_a_id);
+}
+
+test("hash", () => {
+    const port_a_ref = sample_a();
 
     expect(port_a_ref.hash()).toEqual(port_a_ref.hash());
     expect(typeof port_a_ref.hash()).toBe("number");
     expect(Number.isInteger(port_a_ref.hash())).toBe(true);
+});
+
+test("toString", () => {
+
+    const s = sample_a().toString();
+
+    expect(typeof s).toEqual("string");
+    expect(s.length).toBeGreaterThan(0);
+});
+
+test("self equality", () => {
+
+    const ref = sample_a();
+
+    expect(ref.equals(ref)).toBe(true);
 });

package/src/core/model/node-graph/node/Port.js

@@ -1,9 +1,9 @@
-import {assert} from "../../../assert.js";
-import {computeHashIntegerArray} from "../../../collection/array/computeHashIntegerArray.js";
-import {computeStringHash} from "../../../primitives/strings/computeStringHash.js";
-import {objectKeyByValue} from "../../object/objectKeyByValue.js";
-import {DataType} from "../DataType.js";
-import {PortDirection} from "./PortDirection.js";
+import { assert } from "../../../assert.js";
+import { computeHashIntegerArray } from "../../../collection/array/computeHashIntegerArray.js";
+import { computeStringHash } from "../../../primitives/strings/computeStringHash.js";
+import { objectKeyByValue } from "../../object/objectKeyByValue.js";
+import { DataType } from "../DataType.js";
+import { PortDirection } from "./PortDirection.js";
 
 /**
  * @type {number}
@@ -94,6 +94,8 @@ export class Port {
                  id, name, direction, dataType
              }, registry) {
 
+        assert.isNonNegativeInteger(id, 'id');
+
         this.id = id;
         this.name = name;
         this.direction = PortDirection[direction];

package/src/core/model/node-graph/node/Port.spec.js

@@ -1,4 +1,7 @@
+import { DataType } from "../DataType.js";
+import { NodeRegistry } from "./NodeRegistry.js";
 import { Port } from "./Port.js";
+import { PortDirection } from "./PortDirection.js";
 
 test("constructor does not throw", () => {
     expect(() => new Port()).not.toThrow();
@@ -51,3 +54,49 @@ test("toString on newly crated instance produces a valid string", () => {
     expect(typeof s).toBe('string');
     expect(s.trim().length).toBeGreaterThan(0); // non-empty
 });
+
+test("fromJSON", () => {
+
+    const registry = new NodeRegistry();
+
+    registry.addType(DataType.from(7, "t"));
+
+    const port = new Port();
+
+    port.fromJSON({
+        id: 3,
+        name: "x",
+        direction: "In",
+        dataType: {
+            id: 7,
+            name: "t"
+        }
+    }, registry);
+
+    expect(port.id).toEqual(3);
+    expect(port.name).toEqual("x");
+    expect(port.direction).toEqual(PortDirection.In);
+    expect(port.dataType.id).toEqual(7);
+    expect(port.dataType.name).toEqual("t");
+});
+
+test("toJSON", () => {
+
+    const port = new Port();
+
+    port.id = 3;
+    port.name = "x";
+    port.direction = PortDirection.Out;
+    port.dataType = DataType.from(7, "t");
+
+    expect(port.toJSON()).toEqual({
+        id: 3,
+        name: "x",
+        direction: "Out",
+        dataType: {
+            id: 7,
+            name: "t"
+        }
+    });
+
+});

package/src/core/process/matcher/and.js

@@ -0,0 +1,16 @@
+import { assert } from "../../assert.js";
+
+/**
+ * Joins two matchers via AND
+ * @param {function(*):boolean} a
+ * @param {function(*):boolean} b
+ * @returns {function(*):boolean}
+ */
+export function and(a, b) {
+    assert.isFunction(a, 'a');
+    assert.isFunction(b, 'b');
+
+    return function (m) {
+        return a(m) && b(m);
+    }
+}

package/src/core/process/matcher/isDefined.js

@@ -0,0 +1,8 @@
+/**
+ *
+ * @param {*} value
+ * @return {boolean}
+ */
+export function isDefined(value) {
+    return value !== undefined;
+}

package/src/core/process/matcher/isEqualTo.js

@@ -0,0 +1,10 @@
+/**
+ * @template T
+ * @param {T} value
+ * @returns {function(T): boolean}
+ */
+export function isEqualTo(value) {
+    return function (x) {
+        return x === value;
+    }
+}

package/src/core/process/matcher/isGreaterThan.js

@@ -0,0 +1,10 @@
+/**
+ *
+ * @param {number} value
+ * @returns {function(*): boolean}
+ */
+export function isGreaterThan(value) {
+    return function (x) {
+        return x > value;
+    }
+}

package/src/core/process/matcher/isGreaterThanOrEqualTo.js

@@ -0,0 +1,10 @@
+/**
+ *
+ * @param {number} value
+ * @returns {function(*): boolean}
+ */
+export function isGreaterThanOrEqualTo(value) {
+    return function (x) {
+        return x >= value;
+    }
+}