@woosh/meep-engine 2.94.7 → 2.95.0

package/build/meep.module.js

@@ -95604,6 +95604,8 @@ class Ticker {
      */
     #isRunning = false;
 
+    #animationFrameHandle = -1;
+    #timeoutHandle = -1;
 
     /**
      * Dispatches time delta in seconds since last tick
@@ -95633,6 +95635,7 @@ class Ticker {
      * @param {*} [thisArg]
      */
     subscribe(callback, thisArg) {
+
         this.onTick.add(callback, thisArg);
     }
 
@@ -95642,17 +95645,23 @@ class Ticker {
      * @param {*} [thisArg]
      */
     unsubscribe(callback, thisArg) {
+
         this.onTick.remove(callback, thisArg);
     }
 
+    #isUpdateLoopActive() {
+        return this.#timeoutHandle !== -1 && this.#animationFrameHandle !== -1;
+    }
+
     /**
      *
      * @param {number} [maxTimeout]
      */
     start({ maxTimeout = 100 } = {}) {
 
-        let timeout = null;
-        let animationFrame = null;
+        if (this.#isUpdateLoopActive()) {
+            throw new Error("Already running");
+        }
 
         this.#isRunning = true;
 
@@ -95666,23 +95675,25 @@ class Ticker {
             this.onTick.send1(delta);
         };
 
-        function timeoutCallback() {
-            cancelAnimationFrame(animationFrame);
+        const timeoutCallback = () => {
+            cancelAnimationFrame(this.#animationFrameHandle);
             animate();
-        }
+        };
 
-        function animationFrameCallback() {
-            clearTimeout(timeout);
+        const animationFrameCallback = () => {
+            clearTimeout(this.#timeoutHandle);
 
             //push tick beyond animation frame stack allowing draw to happen
-            setTimeout(animate, 0);
-        }
+            this.#timeoutHandle = setTimeout(animate, 0);
+        };
+
+        const animate = () => {
+            this.#animationFrameHandle = requestAnimationFrame(animationFrameCallback);
 
-        function animate() {
-            animationFrame = requestAnimationFrame(animationFrameCallback);
             update();
-            timeout = setTimeout(timeoutCallback, maxTimeout);
-        }
+
+            this.#timeoutHandle = setTimeout(timeoutCallback, maxTimeout);
+        };
 
         this.clock.getDelta(); //purge delta
         this.clock.start();
@@ -95691,12 +95702,32 @@ class Ticker {
     }
 
     pause() {
+
+        if (!this.#isUpdateLoopActive()) {
+            throw new Error("Not currently running");
+        }
+
         this.#isRunning = false;
     }
 
     resume() {
+
+        if (!this.#isUpdateLoopActive()) {
+            throw new Error("Not currently running");
+        }
+
+
         this.#isRunning = true;
     }
+
+    stop() {
+        clearTimeout(this.#timeoutHandle);
+        cancelAnimationFrame(this.#animationFrameHandle);
+        this.#isRunning = false;
+
+        this.#timeoutHandle = -1;
+        this.#animationFrameHandle = -1;
+    }
 }
 
 /**

package/package.json

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

package/src/core/collection/array/array_deduplicate.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Returns a copy without any duplicate elements
+ * @template T
+ * @param {T[]} input
+ * @return {T[]}
+ */
+export function array_deduplicate<T>(input: T[]): T[];
+//# sourceMappingURL=array_deduplicate.d.ts.map

package/src/core/collection/array/array_deduplicate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"array_deduplicate.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/array/array_deduplicate.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,sDAEC"}

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

@@ -0,0 +1,9 @@
+/**
+ * Returns a copy without any duplicate elements
+ * @template T
+ * @param {T[]} input
+ * @return {T[]}
+ */
+export function array_deduplicate(input) {
+    return Array.from(new Set(input));
+}

package/src/core/collection/array/array_deduplicate.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=array_deduplicate.spec.d.ts.map

package/src/core/collection/array/array_deduplicate.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"array_deduplicate.spec.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/array/array_deduplicate.spec.js"],"names":[],"mappings":""}

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

@@ -0,0 +1,11 @@
+import { array_deduplicate } from "./array_deduplicate.js";
+
+test("basics", () => {
+    expect(array_deduplicate([])).toEqual([]);
+    expect(array_deduplicate([1])).toEqual([1]);
+    expect(array_deduplicate([1, 2])).toEqual([1, 2]);
+    expect(array_deduplicate([1, 2, 2])).toEqual([1, 2]);
+    expect(array_deduplicate([1, 2, 1])).toEqual([1, 2]);
+    expect(array_deduplicate([1, 1, 2])).toEqual([1, 2]);
+    expect(array_deduplicate([1, 2])).toEqual([1, 2]);
+});

package/src/core/model/node-graph/node/NodeInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeInstance.d.ts","sourceRoot":"","sources":["../../../../../../src/core/model/node-graph/node/NodeInstance.js"],"names":[],"mappings":"AAcA;IAEI;;;OAGG;IACH,IAFU,MAAM,CAEE;IAElB;;;OAGG;IACH,6BAAmB;IAEnB;;;OAGG;IACH,WAFU,yBAAyB,EAAE,CAEtB;IAEf;;;OAGG;IACH,gBAAgB;IAEhB;;;OAGG;IACH,qBAAmB;IAEnB;;;OAGG;IACH,aAFU,gBAAgB,CAED;IAEzB;;;;;;OAMG;IACH,wBAFU,MAAM,CAEE;IAElB;;OAEG;IACH;QACI;;;WAGG;mCADO,OAAO,MAAM,WAAO;QAG9B;;;WAGG;iCADO,OAAO,MAAM,MAAI;QAG3B;;;WAGG;mCADO,OAAO,MAAM,MAAI;MAG7B;IAEF;;;;;;OAMG;IACH,yBALW,MAAM,aACN,aAAa,UACb,YAAY,GACV,MAAM,CAsBlB;IAED;;;OAGG;IACH,gDAEC;IAED;;;OAGG;IACH,+CAEC;IAGD;;;OAGG;IACH,mCAEC;IAED;;;;OAIG;IACH,kCAEC;IAED;;;;OAIG;IACH,mBAHW,MAAM,oBAKhB;IAED;;;;OAIG;IACH,mBAHW,MAAM,OAKhB;IAED;;;;OAIG;IACH,yBAHW,MAAM,KAOhB;IAED;;;;OAIG;IACH,2BAHW,MAAM,oBAmChB;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACJ,OAAO,CAkBnB;IAED;;;OAGG;IACH,uCAQC;IAED,wBAIC;IAED;;;OAGG;IACH,4CAwBC;IAED;;;;OAIG;IACH,kBAHW,MAAM,GACJ,yBAAyB,GAAC,SAAS,CAe/C;IAED,eAEC;IAED;;;;OAIG;IACH,cAHW,YAAY,GACV,OAAO,CAQnB;IAED,mBAEC;IAIL;;;OAGG;IACH,yBAFU,OAAO,CAEoB;CAPpC;0CAjUuC,gCAAgC;iBAHvD,kCAAkC;mBAChC,kCAAkC;8BAGzB,oBAAoB"}
+{"version":3,"file":"NodeInstance.d.ts","sourceRoot":"","sources":["../../../../../../src/core/model/node-graph/node/NodeInstance.js"],"names":[],"mappings":"AAcA;IAEI;;;OAGG;IACH,IAFU,MAAM,CAEE;IAElB;;;OAGG;IACH,6BAAmB;IAEnB;;;OAGG;IACH,WAFU,yBAAyB,EAAE,CAEtB;IAEf;;;OAGG;IACH,gBAAgB;IAEhB;;;OAGG;IACH,qBAAmB;IAEnB;;;OAGG;IACH,aAFU,gBAAgB,CAED;IAEzB;;;;;;OAMG;IACH,wBAFU,MAAM,CAEE;IAElB;;OAEG;IACH;QACI;;;WAGG;mCADO,OAAO,MAAM,WAAO;QAG9B;;;WAGG;iCADO,OAAO,MAAM,MAAI;QAG3B;;;WAGG;mCADO,OAAO,MAAM,MAAI;QAI3B;;;;WAIG;qCADO,wCAAwC;MAGpD;IAEF;;;;;;OAMG;IACH,yBALW,MAAM,aACN,aAAa,UACb,YAAY,GACV,MAAM,CAsBlB;IAED;;;OAGG;IACH,gDAEC;IAED;;;OAGG;IACH,+CAEC;IAGD;;;OAGG;IACH,mCAEC;IAED;;;;OAIG;IACH,kCAEC;IAED;;;;OAIG;IACH,mBAHW,MAAM,oBAKhB;IAED;;;;OAIG;IACH,mBAHW,MAAM,OAKhB;IAED;;;;OAIG;IACH,yBAHW,MAAM,KAOhB;IAED;;;;OAIG;IACH,2BAHW,MAAM,oBAmChB;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACJ,OAAO,CAkBnB;IAED;;;OAGG;IACH,uCAQC;IAED,wBAIC;IAED;;;OAGG;IACH,mDAqCC;IAED;;;;OAIG;IACH,kBAHW,MAAM,GACJ,yBAAyB,GAAC,SAAS,CAe/C;IAED,eAEC;IAED;;;;OAIG;IACH,cAHW,YAAY,GACV,OAAO,CAQnB;IAED,mBAEC;IAIL;;;OAGG;IACH,yBAFU,OAAO,CAEoB;CAPpC;0CArVyC,gCAAgC;iBAHzD,kCAAkC;mBAChC,kCAAkC;8BAGvB,oBAAoB"}

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

@@ -1,10 +1,10 @@
-import {assert} from "../../../assert.js";
-import {isArrayEqual} from "../../../collection/array/isArrayEqual.js";
+import { assert } from "../../../assert.js";
+import { isArrayEqual } from "../../../collection/array/isArrayEqual.js";
 import List from "../../../collection/list/List.js";
 import Signal from "../../../events/signal/Signal.js";
-import {objectDeepEquals} from "../../object/objectDeepEquals.js";
-import {NodeInstancePortReference} from "./NodeInstancePortReference.js";
-import {PortDirection} from "./PortDirection.js";
+import { objectDeepEquals } from "../../object/objectDeepEquals.js";
+import { NodeInstancePortReference } from "./NodeInstancePortReference.js";
+import { PortDirection } from "./PortDirection.js";
 
 /**
  *
@@ -78,6 +78,13 @@ export class NodeInstance {
          * @type {Signal<string, *>}
          */
         parameterRemoved: new Signal(),
+
+        /**
+         * fires: (newDescription:NodeDescription, oldDescription:NodeDescription|null)
+         * @readonly
+         * @type {Signal<NodeDescription, NodeDescription>}
+         */
+        descriptionChanged: new Signal()
     };
 
     /**
@@ -256,32 +263,45 @@ export class NodeInstance {
 
     /**
      *
-     * @param {NodeDescription} node
+     * @param {NodeDescription} description
      */
-    setDescription(node) {
-        this.description = node;
+    setDescription(description) {
+        assert.defined(description, 'description');
+        assert.isObject(description, 'description');
+        assert.equal(description.isNodeDescription, true, 'description.isNodeDescription !== true');
+
+        if (!this.connections.isEmpty()) {
+            throw new Error("Node is has connections, can only change description for unconnected nodes");
+        }
 
-        node.configureNode(this);
+        const old_description = this.description;
+
+        this.description = description;
+
+        description.configureNode(this);
 
         //generate endpoints
-        this.endpoints = node.getPorts().map((port, port_index) => {
-            const endpoint = new NodeInstancePortReference();
+        this.endpoints = description.getPorts()
+            .map((port, port_index) => {
+                const endpoint = new NodeInstancePortReference();
 
-            endpoint.id = port_index;
-            endpoint.port = port;
-            endpoint.instance = this;
+                endpoint.id = port_index;
+                endpoint.port = port;
+                endpoint.instance = this;
 
-            return endpoint;
-        });
+                return endpoint;
+            });
 
         //clear parameters
         this.clearParameters();
 
         // TODO address parameters in NodeDescription as well
         //populate parameter defaults
-        node.parameters.forEach(pd => {
+        description.parameters.forEach(pd => {
             this.parameters[pd.id] = pd.defaultValue;
         });
+
+        this.on.descriptionChanged.send2(description, old_description);
     }
 
     /**

package/src/engine/simulation/Ticker.d.ts

@@ -3,13 +3,12 @@ import Signal from "../../core/events/signal/Signal";
 export default class Ticker {
     readonly onTick: Signal<number>
 
-    /**
-     * @deprecated
-     */
-    subscribe(f: (timeDelta: number) => any, thisArg?: any): void
-
-    /**
-     * @deprecated
-     */
-    unsubscribe(f: (timeDelta: number) => any, thisArg?: any): void
+    start(): void
+
+    stop(): void
+
+    pause(): void
+
+    resume(): void
+
 }

package/src/engine/simulation/Ticker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Ticker.d.ts","sourceRoot":"","sources":["../../../../src/engine/simulation/Ticker.js"],"names":[],"mappings":";AAOA;;;;GAIG;AACH;IACI;;;OAGG;IACH,gBAFU,KAAK,CAEK;IASpB;;;;OAIG;IACH,iBAFU,OAAO,MAAM,CAAC,CAEF;IAEtB;;OAEG;IACH,sBAEC;IAUD;;;;OAIG;IACH,mDAEC;IAED;;;;OAIG;IACH,qDAEC;IAED;;;OAGG;IACH,uBAFW,MAAM,QA2ChB;IAED,cAEC;IAED,eAEC;;CACJ;kBAnHiB,aAAa;mBADZ,oCAAoC"}
+{"version":3,"file":"Ticker.d.ts","sourceRoot":"","sources":["../../../../src/engine/simulation/Ticker.js"],"names":[],"mappings":";AAOA;;;;GAIG;AACH;IACI;;;OAGG;IACH,gBAFU,KAAK,CAEK;IAWpB;;;;OAIG;IACH,iBAFU,OAAO,MAAM,CAAC,CAEF;IAEtB;;OAEG;IACH,sBAEC;IAUD;;;;OAIG;IACH,mDAIC;IAED;;;;OAIG;IACH,qDAIC;IAMD;;;OAGG;IACH,uBAFW,MAAM,QA8ChB;IAED,cAOC;IAED,eAQC;IAED,aAOC;;CACJ;kBApJiB,aAAa;mBADZ,oCAAoC"}

package/src/engine/simulation/Ticker.js

@@ -23,6 +23,8 @@ class Ticker {
      */
     #isRunning = false;
 
+    #animationFrameHandle = -1;
+    #timeoutHandle = -1;
 
     /**
      * Dispatches time delta in seconds since last tick
@@ -52,6 +54,8 @@ class Ticker {
      * @param {*} [thisArg]
      */
     subscribe(callback, thisArg) {
+        console.warn('deprecated use onTick signal directly instead');
+
         this.onTick.add(callback, thisArg);
     }
 
@@ -61,9 +65,15 @@ class Ticker {
      * @param {*} [thisArg]
      */
     unsubscribe(callback, thisArg) {
+        console.warn('deprecated use onTick signal directly instead');
+
         this.onTick.remove(callback, thisArg);
     }
 
+    #isUpdateLoopActive() {
+        return this.#timeoutHandle !== -1 && this.#animationFrameHandle !== -1;
+    }
+
     /**
      *
      * @param {number} [maxTimeout]
@@ -72,8 +82,9 @@ class Ticker {
         assert.isNumber(maxTimeout, 'maxTimeout');
         assert.greaterThan(maxTimeout, 0);
 
-        let timeout = null;
-        let animationFrame = null;
+        if (this.#isUpdateLoopActive()) {
+            throw new Error("Already running");
+        }
 
         this.#isRunning = true;
 
@@ -87,22 +98,24 @@ class Ticker {
             this.onTick.send1(delta);
         }
 
-        function timeoutCallback() {
-            cancelAnimationFrame(animationFrame);
+        const timeoutCallback = () => {
+            cancelAnimationFrame(this.#animationFrameHandle);
             animate();
         }
 
-        function animationFrameCallback() {
-            clearTimeout(timeout);
+        const animationFrameCallback = () => {
+            clearTimeout(this.#timeoutHandle);
 
             //push tick beyond animation frame stack allowing draw to happen
-            setTimeout(animate, 0);
+            this.#timeoutHandle = setTimeout(animate, 0);
         }
 
-        function animate() {
-            animationFrame = requestAnimationFrame(animationFrameCallback);
+        const animate = () => {
+            this.#animationFrameHandle = requestAnimationFrame(animationFrameCallback);
+
             update();
-            timeout = setTimeout(timeoutCallback, maxTimeout);
+
+            this.#timeoutHandle = setTimeout(timeoutCallback, maxTimeout);
         }
 
         this.clock.getDelta(); //purge delta
@@ -112,12 +125,32 @@ class Ticker {
     }
 
     pause() {
+
+        if (!this.#isUpdateLoopActive()) {
+            throw new Error("Not currently running");
+        }
+
         this.#isRunning = false;
     }
 
     resume() {
+
+        if (!this.#isUpdateLoopActive()) {
+            throw new Error("Not currently running");
+        }
+
+
         this.#isRunning = true;
     }
+
+    stop() {
+        clearTimeout(this.#timeoutHandle);
+        cancelAnimationFrame(this.#animationFrameHandle);
+        this.#isRunning = false;
+
+        this.#timeoutHandle = -1;
+        this.#animationFrameHandle = -1;
+    }
 }
 
 export default Ticker;