@woosh/meep-engine 2.131.9 → 2.131.11

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

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

@@ -1,6 +1,8 @@
 /**
  * Utility for loading multiple assets together.
  *
+ * NOTE: A pre-loader is not intended to be re-used. You have one collection of assets to be loaded, use one {@link AssetPreloader} instance for it. For another batch - use a separate instance.
+ *
  * @example
  *  const loader = new AssetPreloader();
  *
@@ -33,9 +35,16 @@ export class AssetPreloader {
         progress: Signal<any, any, any, any, any, any, any, any>;
         levelFinished: Signal<any, any, any, any, any, any, any, any>;
         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>;
+        started: Signal<any, any, any, any, any, any, any, any>;
+        /**
+         * @type {Signal<number>}
+         */
+        completed: Signal<number>;
+        /**
+         * All assets are processed, even if some have errored out
+         * @type {Signal<number,number>}
+         */
+        resolved: Signal<number, number>;
     };
     /**
      *

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":"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"}
+{"version":3,"file":"AssetPreloader.d.ts","sourceRoot":"","sources":["../../../../../src/engine/asset/preloader/AssetPreloader.js"],"names":[],"mappings":"AAsDA;;;;;;;;;;;;;;;;;GAiBG;AACH;IACI;;;OAGG;IACH,iBAFU,MAAM,CAEI;IAEpB;;;OAGG;IACH,iBAFU,aAAa,EAAE,EAAE,CAEf;IAEZ;;OAEG;IACH;;;;;;QAMI;;WAEG;mBADO,OAAO,MAAM,CAAC;QAGxB;;;WAGG;kBADO,OAAO,MAAM,EAAC,MAAM,CAAC;MAGjC;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,CA+JzB;CACJ;AAED;;;GAGG;AACH,wBAFU,cAAc,CAEgB;AAhVxC;;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,4 +1,5 @@
 import { assert } from "../../../core/assert.js";
+import { array_push_if_unique } from "../../../core/collection/array/array_push_if_unique.js";
 import Signal from "../../../core/events/signal/Signal.js";
 import { clamp01 } from "../../../core/math/clamp01.js";
 import AssetLevel from "./AssetLevel.js";
@@ -54,6 +55,8 @@ class AssetLoadSpec {
 /**
  * Utility for loading multiple assets together.
  *
+ * NOTE: A pre-loader is not intended to be re-used. You have one collection of assets to be loaded, use one {@link AssetPreloader} instance for it. For another batch - use a separate instance.
+ *
  * @example
  *  const loader = new AssetPreloader();
  *
@@ -88,8 +91,15 @@ export class AssetPreloader {
         progress: new Signal(),
         levelFinished: new Signal(),
         error: new Signal(),
-        loadStart: new Signal(),
+        started: new Signal(),
+        /**
+         * @type {Signal<number>}
+         */
         completed: new Signal(),
+        /**
+         * All assets are processed, even if some have errored out
+         * @type {Signal<number,number>}
+         */
         resolved: new Signal(),
     };
 
@@ -167,6 +177,9 @@ export class AssetPreloader {
      * @return {AssetPreloader}
      */
     load(assetManager) {
+        assert.defined(assetManager, 'assetManager');
+        assert.equal(assetManager.isAssetManager, true, 'assetManager.isAssetManager !== true');
+
         const on = this.on;
 
         //current level being processed
@@ -180,15 +193,41 @@ export class AssetPreloader {
             };
         });
 
-        on.loadStart.send1(initEvent);
+        on.started.send1(initEvent);
         const numAssets = this.totalAssetCount;
+
         let numAssetsLoaded = 0;
+        let numAssetsFailed = 0;
+
+        let finished = false;
+
+        function try_finish() {
+            if (finished) {
+                // already done
+                return;
+            }
+
+            const totalProcessed = numAssetsLoaded + numAssetsFailed;
+
+            if (totalProcessed <= numAssets) {
+                // not done yet
+                return;
+            }
+
+            if (numAssetsFailed === 0) {
+                on.completed.send1(numAssetsLoaded);
+            }
+
+            on.resolved.send2(numAssetsLoaded, numAssetsFailed);
+
+            finished = true;
+        }
 
         /**
          * submit requests in batches in order of importance
          * @param {number} level
          */
-        function loadBatch(level) {
+        function load_level(level) {
             // filter out assets of the specified level
             const batch = assets[level];
 
@@ -232,10 +271,14 @@ export class AssetPreloader {
                     on.levelFinished.dispatch(level);
                 }
 
+                try_finish();
             }
 
             function assetLoadFailed(e) {
+                numAssetsFailed++;
                 on.error.dispatch(e);
+
+                try_finish();
             }
 
             //sort batch by priority
@@ -243,7 +286,7 @@ export class AssetPreloader {
                 return b.priotity - a.priotity;
             });
 
-            batch.forEach(function (def) {
+            for (const def of batch) {
 
                 assetManager.get({
                     path: def.uri,
@@ -252,14 +295,17 @@ export class AssetPreloader {
                     failure: assetLoadFailed
                 });
 
-            });
+            }
         }
 
+        /**
+         *
+         * @type {number[]}
+         */
         const levels = [];
+
         for (let level in assets) {
-            if (assets.hasOwnProperty(level)) {
-                levels.push(level);
-            }
+            array_push_if_unique(levels, level);
         }
 
         let lastLoadedLevel = 0;
@@ -268,16 +314,18 @@ export class AssetPreloader {
 
             if (lastLoadedLevel < levels.length) {
 
+                // load next
+
                 const levelToLoad = lastLoadedLevel;
                 lastLoadedLevel++;
                 on.levelFinished.addOne(prod);
 
-                //console.log('requesting load of level ',levelToLoad);
-
-                loadBatch(levelToLoad);
+                load_level(levelToLoad);
 
             } else {
-                on.completed.send0();
+
+                // we're done
+
             }
 
         }