@woosh/meep-engine 2.94.7 → 2.94.8

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.94.8",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

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;