@woosh/meep-engine 2.126.68 → 2.126.71

package/package.json

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

package/src/core/collection/map/ObservedMap.d.ts

@@ -26,6 +26,12 @@ export class ObservedMap<K, V> {
      * @type {Map<K, V>}
      */
     data: Map<K_1, V_1>;
+    /**
+     *
+     * @param {K} key
+     * @return {boolean}
+     */
+    has(key: K): boolean;
     /**
      *
      * @param {K} key

package/src/core/collection/map/ObservedMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservedMap.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/map/ObservedMap.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH;IAeI;;;OAGG;IACH,oCAOC;IAzBD;;OAEG;IACH;QACI;;WAEG;aADO,MAAM;QAGhB;;WAEG;iBADO,MAAM;MAGlB;IAQE;;;OAGG;IACH,oBAAkB;IAGtB;;;;OAIG;IACH,SAHW,CAAC,GACC,CAAC,GAAC,SAAS,CAIvB;IAED;;;;;OAKG;IACH,SAJW,CAAC,SACD,CAAC,yBAQX;IAED;;;;OAIG;IACH,YAHW,CAAC,GACC,OAAO,CAUnB;IAED;;;;OAIG;IACH,iDAEC;IAED;;;OAGG;IACH,mBAEC;CACJ;mBAvFkB,+BAA+B"}
+{"version":3,"file":"ObservedMap.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/map/ObservedMap.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH;IAeI;;;OAGG;IACH,oCAOC;IAzBD;;OAEG;IACH;QACI;;WAEG;aADO,MAAM;QAGhB;;WAEG;iBADO,MAAM;MAGlB;IAQE;;;OAGG;IACH,oBAAkB;IAGtB;;;;OAIG;IACH,SAHW,CAAC,GACA,OAAO,CAIlB;IAED;;;;OAIG;IACH,SAHW,CAAC,GACC,CAAC,GAAC,SAAS,CAIvB;IAED;;;;;OAKG;IACH,SAJW,CAAC,SACD,CAAC,yBAQX;IAED;;;;OAIG;IACH,YAHW,CAAC,GACC,OAAO,CAUnB;IAED;;;;OAIG;IACH,iDAEC;IAED;;;OAGG;IACH,mBAEC;CACJ;mBAhGkB,+BAA+B"}

package/src/core/collection/map/ObservedMap.js

@@ -32,6 +32,15 @@ export class ObservedMap {
         this.data = source;
     }
 
+    /**
+     *
+     * @param {K} key
+     * @return {boolean}
+     */
+    has(key){
+        return this.data.has(key);
+    }
+
     /**
      *
      * @param {K} key

package/src/engine/asset/AssetManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssetManager.d.ts","sourceRoot":"","sources":["../../../../src/engine/asset/AssetManager.js"],"names":[],"mappings":"AA8CA;;;;GAIG;AACH;IAgII;;;;;OAKG;IACH,oCAJW,GAAG,EAYb;IA7ID;;;;OAIG;IACH,eAEG;IAEH;;;OAGG;IACH,aAFU,YAAY,gBAAgB,EAAE,YAAY,CAAC,CAER;IAe7C;;;;;;OAMG;IACH,kBAFU,MAAM,CAEY;IAyB5B;;;;OAIG;IACH,iBAAc;IAEd;;;OAGG;IACH,mBAFU,iBAAiB,CAEiB;IAwE5C,gBAQC;IAED;;;;OAIG;IACH,qBAHW,MAAM,GACL,QAAQ,IAAI,CAAC,CAexB;IAED;;;;;OAKG;IACH,oCAFa,OAAO,CAOnB;IAED;;OAEG;IACH,cAEC;IAED,8BAEC;IAED;;;;;;OAMG;IACH,4DAJW,iBAAiB,GAEf,cAAc,CAY1B;IAED;;;;;;;;;OASG;IACH,qFAsCC;IAED;;;;;OAKG;IACH,aAJW,MAAM,QACN,MAAM,sBAmBhB;IA2QD;;;;;OAKG;IACH,sBA2BC;IAGD;;;;OAIG;IACH,uBAHW,MAAM,GACL,OAAO,CAIlB;IAED;;;;OAIG;IACH,sBAHW,MAAM,GACJ,wBAAY,SAAS,CAMjC;IAaD;;;;OAIG;IACH,+BAHW,MAAM,4CAqBhB;IAED;;;;OAIG;IACH,iCAHW,MAAM,+CAyBhB;IAED;;;;;;OAMG;IACH,6BAJW,MAAM,kCAEJ,QAAQ,OAAO,CAAC,CAU5B;IAED;;;;;OAKG;IACH,0BAJW,MAAM,iEAwChB;IAED;;;OAGG;IACH,uBAFW,MAAM,iBAkBhB;IAED;;;;;;OAMG;IACH,yCAFa,aAAS,IAAI,CAYzB;IAED;;;;;OAKG;IACH,eAJW,MAAM,QACN,MAAM,GACJ,OAAO,CAMnB;IAED;;;;OAIG;IACH,2BAHW,MAAM,GACL,mBAAiB,CAa5B;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACL,gBAAgB,GAAC,SAAS,CAQrC;IAED;;;;;OAKG;IACH,mBAJW,MAAM,QACN,MAAM,QACN,MAAM,QAUhB;IAGL;;;OAGG;IACH,yBAFU,OAAO,CAEoB;;CANpC;4BAn3B2B,0CAA0C;iCAOrC,uBAAuB;6BAM3B,mBAAmB;kCAFd,6BAA6B;kCAD7B,wBAAwB;4BAE9B,0BAA0B"}
+{"version":3,"file":"AssetManager.d.ts","sourceRoot":"","sources":["../../../../src/engine/asset/AssetManager.js"],"names":[],"mappings":"AA8CA;;;;GAIG;AACH;IAgII;;;;;OAKG;IACH,oCAJW,GAAG,EAYb;IA7ID;;;;OAIG;IACH,eAEG;IAEH;;;OAGG;IACH,aAFU,YAAY,gBAAgB,EAAE,YAAY,CAAC,CAER;IAe7C;;;;;;OAMG;IACH,kBAFU,MAAM,CAEY;IAyB5B;;;;OAIG;IACH,iBAAc;IAEd;;;OAGG;IACH,mBAFU,iBAAiB,CAEiB;IAwE5C,gBAQC;IAED;;;;OAIG;IACH,qBAHW,MAAM,GACL,QAAQ,IAAI,CAAC,CAexB;IAED;;;;;OAKG;IACH,oCAFa,OAAO,CAOnB;IAED;;OAEG;IACH,cAEC;IAED,8BAEC;IAED;;;;;;OAMG;IACH,4DAJW,iBAAiB,GAEf,cAAc,CAY1B;IAED;;;;;;;;;OASG;IACH,qFAsCC;IAED;;;;;;;OAOG;IACH,gBAJW,MAAM,QACN,MAAM,GACL,OAAO,CAKlB;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,uBAZW,MAAM,QACN,MAAM,gBAEJ,mBAAiB,CA4D7B;IAED;;;;;;;;OAQG;IACH,kBAJW,MAAM,QACN,MAAM,2BAiChB;IA2QD;;;;;OAKG;IACH,sBA2BC;IAGD;;;;OAIG;IACH,uBAHW,MAAM,GACL,OAAO,CAIlB;IAED;;;;OAIG;IACH,sBAHW,MAAM,GACJ,wBAAY,SAAS,CAMjC;IAaD;;;;OAIG;IACH,+BAHW,MAAM,4CAqBhB;IAED;;;;OAIG;IACH,iCAHW,MAAM,+CAyBhB;IAED;;;;;;OAMG;IACH,6BAJW,MAAM,kCAEJ,QAAQ,OAAO,CAAC,CAU5B;IAED;;;;;OAKG;IACH,0BAJW,MAAM,iEAwChB;IAED;;;OAGG;IACH,uBAFW,MAAM,iBAkBhB;IAED;;;;;;OAMG;IACH,yCAFa,aAAS,IAAI,CAYzB;IAED;;;;;OAKG;IACH,eAJW,MAAM,QACN,MAAM,GACJ,OAAO,CAMnB;IAED;;;;OAIG;IACH,2BAHW,MAAM,GACL,mBAAiB,CAa5B;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACL,gBAAgB,GAAC,SAAS,CAQrC;IAED;;;;;OAKG;IACH,mBAJW,MAAM,QACN,MAAM,QACN,MAAM,QAUhB;IAGL;;;OAGG;IACH,yBAFU,OAAO,CAEoB;;CANpC;4BA19B2B,0CAA0C;iCAOrC,uBAAuB;6BAM3B,mBAAmB;kCAFd,6BAA6B;kCAD7B,wBAAwB;4BAE9B,0BAA0B"}

package/src/engine/asset/AssetManager.js

@@ -316,28 +316,131 @@ export class AssetManager {
         }
     }
 
+    /**
+     * Checks if an asset is currently being loaded.
+     * Useful for avoiding redundant requests.
+     *
+     * @param {string} path
+     * @param {string} type
+     * @return {boolean}
+     */
+    isPending(path, type) {
+        const assetDescription = new AssetDescription(path, type);
+        return this.request_map.has(assetDescription);
+    }
+
+    /**
+     * Same as {@link insert}, but will register the asset as pending until loader function resolves.
+     *
+     * NOTE: {@link AssetTransformer}s are not applied to the asset
+     *
+     * NOTE: any subsequent normal requests such as {@link get} will be routed to the same loader
+     *
+     * @template T
+     * @param {string} path
+     * @param {string} type
+     * @param {function(progress?:function(current:number, total:number)):Promise<Asset<T>>} loader
+     * @returns {Promise<Asset<T>>} loaded asset
+     * @see insert
+     * @example
+     *   manager.insertAsync('path/to/asset', 'my-type', async (progress) => {
+     *       const asset = await loadAssetFromNetwork('path/to/asset', 'type', progress);
+     *       return asset;
+     *   });
+     *
+     */
+    insertAsync(path, type, loader) {
+
+        const asset_descriptor = new AssetDescription(path, type);
+
+        if (this.request_map.get(asset_descriptor)) {
+            throw new Error(`Asset with path '${path}' and type '${type}' is already pending`);
+        }
+
+        const pending = new PendingAsset(asset_descriptor);
+
+        this.request_map.set(asset_descriptor, pending);
+
+        /**
+         *
+         * @param {number} current
+         * @param {number} total
+         */
+        const progress = (current, total) => {
+            pending.progress.setValue(current);
+            pending.progress.setUpperLimit(total);
+        };
+
+        const asset_promise = loader(progress);
+
+        const cleanup = () => {
+            const existing = this.request_map.get(asset_descriptor);
+
+            if (existing !== pending) {
+                // looks like another resolution is pending, this completely invalidates current insersion request
+                // Likely reason is that something else was inserted later on
+                return false;
+            }
+
+            this.request_map.delete(asset_descriptor);
+            return true;
+        }
+
+        return asset_promise.then(asset => {
+            if (cleanup()) {
+                this.insert(path, type, asset);
+
+                return asset;
+            } else {
+                throw new Error(`Race condition. Asset with path '${path}' and type '${type}' was already resolved somewhere else.`);
+            }
+        }, error => {
+            cleanup();
+
+            //rethrow
+            throw error;
+        });
+    }
+
     /**
      * Manually add a fully resolved resource
+     * NOTE: {@link AssetTransformer}s are not applied to the asset
+     *
+     * @template T
      * @param {string} path
      * @param {string} type
-     * @param {Asset} asset
+     * @param {Asset<T>} asset
      */
     insert(path, type, asset) {
         assert.isString(path, 'path');
         assert.isString(type, 'type');
         assert.isObject(asset, 'asset');
 
-        const assetDescription = new AssetDescription(path, type);
+        const asset_descritptor = new AssetDescription(path, type);
 
-        const existing_resource = this.assets.get(assetDescription);
+        const existing_resource = this.assets.get(asset_descritptor);
 
         if (existing_resource !== undefined && existing_resource !== asset) {
-            console.warn(`Another asset under ${assetDescription} already exists and will be replaced`);
+            console.warn(`Another asset under ${asset_descritptor} already exists and will be replaced`);
         }
 
-        // TODO check for assets in-flight
+        // check for assets in-flight
+        const pending = this.request_map.get(asset_descritptor);
+        if (pending !== undefined) {
+            console.warn(`Asset with path '${path}' and type '${type}' is already pending, this operation will squash the asset in-flight`);
+
+            this.request_map.delete(asset_descritptor);
+
+            const requests = pending.requests;
+            const request_count = requests.length;
+
+            for (let i = 0; i < request_count; i++) {
+                const request = requests[i];
+                this.#schedule_response(asset, request);
+            }
+        }
 
-        this.assets.set(assetDescription, asset);
+        this.assets.set(asset_descritptor, asset);
     }
 
     /**