@woosh/meep-engine 2.131.7 → 2.131.9

package/package.json

@@ -5,7 +5,7 @@
   "description": "Pure JavaScript game engine. Fully featured and production ready.",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.131.7",
+  "version": "2.131.9",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/events/signal/Signal.d.ts

@@ -48,6 +48,8 @@ export default class Signal<A = any, B = any, C = any, D = any, E = any, F = any
      */
     dispatch(...params: any[]): void
 
+    promise(): Promise<[A, B, C, D, E, F, G, H]>
+
     /**
      * @deprecated
      */

package/src/core/events/signal/Signal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Signal.d.ts","sourceRoot":"","sources":["../../../../../src/core/events/signal/Signal.js"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AACH;IACI;;;;OAIG;IACH,iBAAqB;IAErB;;;;OAIG;IACH,cAAU;IAEV;;;OAGG;IACH,YAFU,MAAM,CAED;IAWf;;;OAGG;IACH,yBAEC;IAfD;;;OAGG;IACH,sBAEC;IAYD;;;;OAIG;IACH,cAHW,MAAM;;KAAY,GAChB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM;;KAAY,GAChB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM;;KAAY,SAClB,OAAO,QAQjB;IAED;;;;OAIG;IACH,cAHW,MAAM;;KAAY,GAChB,OAAO,CAInB;IAGD;;;;;OAKG;IACH,4CAFa,OAAO,CAcnB;IAED,aAEC;IAED,eAEC;IAED;;;OAGG;IACH,eAFa,OAAO,CAInB;IAED;;;;OAIG;IACH,yCAQC;IAED;;;;OAIG;IACH,sCAOC;IA8BD;;;;;OAKG;IACH,oCAFa,OAAO,CA2CnB;IAED;;;;;;OAMG;IACH,kBAEC;IAqDD;;;OAGG;IACH,+BA2CC;IAGD;;;OAGG;IACH,4BA6CC;IAED;;;;OAIG;IACH,sCA4CC;IAED;;;;OAIG;IACH,4CA2CC;IAED;;;;;OAKG;IACH,oDA2CC;IAED;;;;;;OAMG;IACH,4DA2CC;IAED;;;;;;;;OAQG;IACH,4EA2CC;IAED;;;;;;;;;;OAUG;IACH,4FA2CC;IAED;;;;OAIG;IACH,aAHW,MAAM,GACJ,MAAM,CAalB;IAIL;;;OAGG;IACH,mBAFU,OAAO,CAEQ;;CAPxB"}
+{"version":3,"file":"Signal.d.ts","sourceRoot":"","sources":["../../../../../src/core/events/signal/Signal.js"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AACH;IACI;;;;OAIG;IACH,iBAAqB;IAErB;;;;OAIG;IACH,cAAU;IAEV;;;OAGG;IACH,YAFU,MAAM,CAED;IAWf;;;OAGG;IACH,yBAEC;IAfD;;;OAGG;IACH,sBAEC;IAYD;;;;OAIG;IACH,cAHW,MAAM;;KAAY,GAChB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM;;KAAY,GAChB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM;;KAAY,SAClB,OAAO,QAQjB;IAED;;;;OAIG;IACH,cAHW,MAAM;;KAAY,GAChB,OAAO,CAInB;IAGD;;;;;OAKG;IACH,4CAFa,OAAO,CAcnB;IAED,aAEC;IAED,eAEC;IAED;;;OAGG;IACH,eAFa,OAAO,CAInB;IAED;;;;OAIG;IACH,yCAQC;IAED;;;;OAIG;IACH,sCAOC;IA8BD;;;;;OAKG;IACH,oCAFa,OAAO,CA2CnB;IAED;;;;;;;;OAQG;IACH,kBAEC;IAqDD;;;;;;;;;;;;;;OAcG;IACH,WAZY,QAAQ,EAAE,CAAC,CAkBtB;IAED;;;OAGG;IACH,+BA2CC;IAGD;;;OAGG;IACH,4BA6CC;IAED;;;;OAIG;IACH,sCA4CC;IAED;;;;OAIG;IACH,4CA2CC;IAED;;;;;OAKG;IACH,oDA2CC;IAED;;;;;;OAMG;IACH,4DA2CC;IAED;;;;;;;;OAQG;IACH,4EA2CC;IAED;;;;;;;;;;OAUG;IACH,4FA2CC;IAED;;;;OAIG;IACH,aAHW,MAAM,GACJ,MAAM,CAalB;IAIL;;;OAGG;IACH,mBAFU,OAAO,CAEQ;;CAPxB"}

package/src/core/events/signal/Signal.js

@@ -235,6 +235,8 @@ export class Signal {
     }
 
     /**
+     * **UNSAFE**
+     *
      * Remove all handlers.
      * Please note that this will remove even all handlers, irrespective of where they were added from. If another script is attaching to the same signal, using this method will potentially break that code.
      * For most use cases, prefer to use {@link remove} method instead, or make use of {@link SignalBinding} if you need to keep track of multiple handlers
@@ -296,6 +298,29 @@ export class Signal {
         return false;
     }
 
+    /**
+     * Utility method, useful in asynchronous programming.
+     * Will resolve at the next {@link dispatch}/{@link send0}/etc.
+     * @return {Promise<[]>}
+     * @see addOne
+     *
+     * @example
+     *      const s = new Signal<number,number>();
+     *
+     *      // ...
+     *      const [x,y] = await s.promise(); // will trigger at the next dispatch
+     *
+     *      // ... then somewhere else
+     *      s.send2(7,-3);
+     */
+    promise(){
+        return new Promise((resolve, reject)=>{
+            this.addOne((...args)=>{
+                resolve(args);
+            })
+        });
+    }
+
     /**
      * NOTE: because of polymorphic call-site nature of this method, it's always better for performance to use monomorphic methods like `send0`, `send1` etc.
      * @param {...*} args

package/src/engine/asset/AssetManager.js

@@ -273,7 +273,7 @@ export class AssetManager {
      * @template T
      * @param {String} path
      * @param {String} type
-     * @param {function(asset:Asset<T>)} [callback]
+     * @param {function(asset:Asset<T>)} [callback] success callback
      * @param {function(*)} [failure]
      * @param {function(loaded:number, total:number)} [progress]
      * @param {boolean} [skip_queue]

package/src/engine/asset/preloader/AssetPreloader.d.ts

@@ -35,6 +35,7 @@ export class AssetPreloader {
         error: Signal<any, any, any, any, any, any, any, any>;
         loadStart: Signal<any, any, any, any, any, any, any, any>;
         completed: Signal<any, any, any, any, any, any, any, any>;
+        resolved: Signal<any, any, any, any, any, any, any, any>;
     };
     /**
      *

package/src/engine/asset/preloader/AssetPreloader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssetPreloader.d.ts","sourceRoot":"","sources":["../../../../../src/engine/asset/preloader/AssetPreloader.js"],"names":[],"mappings":"AAoDA;;;;;;;;;;;;;;;GAeG;AACH;IACI;;;OAGG;IACH,iBAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,iBAFU,aAAa,EAAE,EAAE,CAEf;IAEZ;;OAEG;IACH;;;;;;;MAOE;IAaF;;;;;;;OAOG;IACH,SANW,MAAM,QACN,MAAM,UACN,MAAM,aACN,MAAM,GACL,cAAc,CAqCzB;IAED;;;OAGG;IACH,aAFW;QAAC,GAAG,EAAC,MAAM,CAAC;QAAC,IAAI,EAAC,MAAM,CAAC;QAAC,KAAK,CAAC,EAAC,MAAM,CAAA;KAAC,EAAE,QAQpD;IAED;;;;OAIG;IACH,kCAFY,cAAc,CAoHzB;CACJ;AAED;;;GAGG;AACH,wBAFU,cAAc,CAEgB;AA3RxC;;GAEG;AACH;IA+BI;;;;OAIG;IACH,4BAFY,aAAa,CAQxB;IAxCG;;;OAGG;IACH,YAAe;IACf;;;OAGG;IACH,aAAgB;IAChB;;;OAGG;IACH,OAFU,MAAM,GAAC,UAAU,CAEK;IAChC;;;OAGG;IACH,UAFU,MAAM,CAEC;IAGrB;;;;;aAKC;CAcJ;mBAjDkB,uCAAuC;uBACnC,iBAAiB"}
+{"version":3,"file":"AssetPreloader.d.ts","sourceRoot":"","sources":["../../../../../src/engine/asset/preloader/AssetPreloader.js"],"names":[],"mappings":"AAqDA;;;;;;;;;;;;;;;GAeG;AACH;IACI;;;OAGG;IACH,iBAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,iBAFU,aAAa,EAAE,EAAE,CAEf;IAEZ;;OAEG;IACH;;;;;;;;MAQE;IAaF;;;;;;;OAOG;IACH,SANW,MAAM,QACN,MAAM,UACN,MAAM,aACN,MAAM,GACL,cAAc,CAqCzB;IAED;;;OAGG;IACH,aAFW;QAAC,GAAG,EAAC,MAAM,CAAC;QAAC,IAAI,EAAC,MAAM,CAAC;QAAC,KAAK,CAAC,EAAC,MAAM,CAAA;KAAC,EAAE,QAQpD;IAED;;;;OAIG;IACH,kCAFY,cAAc,CAyHzB;CACJ;AAED;;;GAGG;AACH,wBAFU,cAAc,CAEgB;AAjSxC;;GAEG;AACH;IA+BI;;;;OAIG;IACH,4BAFY,aAAa,CAQxB;IAxCG;;;OAGG;IACH,YAAe;IACf;;;OAGG;IACH,aAAgB;IAChB;;;OAGG;IACH,OAFU,MAAM,GAAC,UAAU,CAEK;IAChC;;;OAGG;IACH,UAFU,MAAM,CAEC;IAGrB;;;;;aAKC;CAcJ;mBAlDkB,uCAAuC;uBAEnC,iBAAiB"}

package/src/engine/asset/preloader/AssetPreloader.js

@@ -1,5 +1,6 @@
 import { assert } from "../../../core/assert.js";
 import Signal from "../../../core/events/signal/Signal.js";
+import { clamp01 } from "../../../core/math/clamp01.js";
 import AssetLevel from "./AssetLevel.js";
 
 /**
@@ -88,7 +89,8 @@ export class AssetPreloader {
         levelFinished: new Signal(),
         error: new Signal(),
         loadStart: new Signal(),
-        completed: new Signal()
+        completed: new Signal(),
+        resolved: new Signal(),
     };
 
     constructor() {
@@ -193,7 +195,7 @@ export class AssetPreloader {
             const batchElementCount = batch.length;
 
             if (batchElementCount === 0) {
-                // batch of 0 elements
+                // a batch of 0 elements.
                 // dispatch completion event
                 on.levelFinished.dispatch(level);
                 //early exit
@@ -206,19 +208,22 @@ export class AssetPreloader {
                 batchElementLoadedCount++;
                 numAssetsLoaded++;
 
-                let ratio = numAssetsLoaded / numAssets;
+                let total_ratio = numAssets > 0 ? clamp01(numAssetsLoaded / numAssets) : 1;
+
+                const level_ratio = batchElementCount > 0 ? clamp01(batchElementLoadedCount / batchElementCount) : 1;
 
                 //dispatch progress
-                on.progress.dispatch({
+                on.progress.send1({
                     level: {
                         id: level,
-                        value: batchElementLoadedCount,
-                        max: batchElementCount
+                        current: batchElementLoadedCount,
+                        total: batchElementCount,
+                        progress: level_ratio,
                     },
                     global: {
-                        value: numAssetsLoaded,
-                        max: numAssets,
-                        fraction: ratio
+                        current: numAssetsLoaded,
+                        total: numAssets,
+                        progress: total_ratio
                     }
                 });
 
@@ -239,12 +244,14 @@ export class AssetPreloader {
             });
 
             batch.forEach(function (def) {
+
                 assetManager.get({
                     path: def.uri,
                     type: def.type,
                     callback: assetLoadSuccess,
                     failure: assetLoadFailed
                 });
+
             });
         }
 

package/src/view/asset/PreloaderView.js

@@ -48,8 +48,8 @@ class PreloaderView extends View {
         });
 
         preloader.on.progress.add(function (e) {
-            bar.value = e.global.value;
-            bar.max = e.global.max;
+            bar.value = e.global.current;
+            bar.max = e.global.total;
         });
     }
 }