@woosh/meep-engine 2.131.8 → 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.8",
+  "version": "2.131.9",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

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;
         });
     }
 }