@woosh/meep-engine 2.100.2 → 2.101.0

package/build/meep.module.js

@@ -67746,6 +67746,83 @@ class AssetLoader {
     }
 }
 
+/**
+ *
+ * @param {Response} input
+ * @param {function} progress
+ * @return {Response}
+ */
+function observeResponseProgress(input, progress) {
+    let response = input;
+
+
+    if (typeof ReadableStream === 'undefined' || response.body.getReader === undefined) {
+
+        return response;
+
+    }
+
+    /**
+     * @type {ReadableStreamDefaultReader<Uint8Array>}
+     */
+    const reader = response.body.getReader();
+
+    const contentLength = response.headers.get('Content-Length');
+    const total = contentLength ? parseInt(contentLength) : 0;
+    let loaded = 0;
+
+    // periodically read data into the new stream tracking while download progress
+    const stream_prototype = {
+        type: "bytes",
+        start(controller) {
+
+            pump();
+
+            function pump() {
+
+                reader.read().then(({ done, value }) => {
+
+                    if (done) {
+                        // no more data, we're done
+                        controller.close();
+                        return;
+                    }
+
+                    loaded += value.byteLength;
+
+                    progress(loaded, total);
+
+                    controller.enqueue(value);
+                    pump();
+
+                });
+
+            }
+
+        }
+
+    };
+
+    /**
+     * @type {ReadableStream}
+     */
+    let stream;
+
+    try {
+        stream = new ReadableStream(stream_prototype);
+
+        response = new Response(stream);
+    } catch (e) {
+        /*
+         Workaround for Safari bug: "TypeError: ReadableByteStreamController is not implemented"
+         By not wrapping the response we lose the ability to track progress, but that's not a critical issue in most cases
+         */
+    }
+
+    return response;
+
+}
+
 class ArrayBufferLoader extends AssetLoader {
     /**
      *
@@ -67764,7 +67841,13 @@ class ArrayBufferLoader extends AssetLoader {
         this.__fetch_priority = fetch_priority;
     }
 
-    load(scope, path, success, failure = console.error, progress = noop) {
+    async load(
+        scope,
+        path,
+        success,
+        failure = console.error,
+        progress = noop
+    ) {
         const coc = this.assetManager !== null ? this.assetManager.crossOriginConfig : CrossOriginConfig.default;
 
         const headers = new Headers();
@@ -67779,112 +67862,36 @@ class ArrayBufferLoader extends AssetLoader {
             request.priority = this.__fetch_priority;
         }
 
-        fetch(request)
-            .then(handle_response)
-            .then(response_to_asset)
-            .catch(failure);
+        let response = await fetch(request);
 
-        /**
-         *
-         * @param {Response} response
-         * @return {Promise<void>}
-         */
-        async function response_to_asset(response) {
-            const arrayBuffer = await response.arrayBuffer();
+        if (!(response.status === 200 || response.status === 0)) {
 
-            const asset = new Asset(
-                function () {
-                    return arrayBuffer;
-                },
-                arrayBuffer.byteSize
-            );
+            throw Error(`fetch for "${response.url}" responded with ${response.status}: ${response.statusText}`);
 
-            success(asset);
         }
 
-        /**
-         *
-         * @param {Response} response
-         * @return {Response}
-         */
-        function handle_response(response) {
-            if (!(response.status === 200 || response.status === 0)) {
-
-                throw Error(`fetch for "${response.url}" responded with ${response.status}: ${response.statusText}`);
-
-            }
-
-            // Some browsers return HTTP Status 0 when using non-http protocol
-            // e.g. 'file://' or 'data://'. Handle as success.
-
-            if (response.status === 0) ;
-
-            if (typeof ReadableStream === 'undefined' || response.body.getReader === undefined) {
-
-                return response;
-
-            }
-
-            /**
-             * @type {ReadableStreamDefaultReader<Uint8Array>}
-             */
-            const reader = response.body.getReader();
-
-            const contentLength = response.headers.get('Content-Length');
-            const total = contentLength ? parseInt(contentLength) : 0;
-            let loaded = 0;
-
-            // periodically read data into the new stream tracking while download progress
-            const stream_prototype = {
-                type: "bytes",
-                start(controller) {
-
-                    pump();
-
-                    function pump() {
-
-                        reader.read().then(({ done, value }) => {
-
-                            if (done) {
-                                // no more data, we're done
-                                controller.close();
-                                return;
-                            }
-
-                            loaded += value.byteLength;
+        // Some browsers return HTTP Status 0 when using non-http protocol
+        // e.g. 'file://' or 'data://'. Handle as success.
 
-                            progress(loaded, total);
+        if (response.status === 0) ;
 
-                            controller.enqueue(value);
-                            pump();
-
-                        });
-
-                    }
-
-                }
-
-            };
-
-            /**
-             * @type {ReadableStream}
-             */
-            let stream;
+        try {
+            response = observeResponseProgress(response, progress);
+        } catch (e) {
+        }
 
-            try {
-                stream = new ReadableStream(stream_prototype);
-            } catch (e) {
-                /*
-                 Workaround for Safari bug: "TypeError: ReadableByteStreamController is not implemented"
-                 By not wrapping the response we lose the ability to track progress, but that's not a critical issue in most cases
-                 */
-                return response;
-            }
+        const arrayBuffer = await response.arrayBuffer();
 
-            return new Response(stream);
-        }
+        const asset = new Asset(
+            function () {
+                return arrayBuffer;
+            },
+            arrayBuffer.byteSize
+        );
 
+        success(asset);
 
+        return asset;
     }
 }
 
@@ -86242,7 +86249,12 @@ class AssetManager {
         try {
 
 
-            loader.load(scope, full_path, success, failure, progress);
+            const result = loader.load(scope, full_path, success, failure, progress);
+
+            if (result instanceof Promise) {
+                // allow promise responses
+                result.catch(failure);
+            }
 
         } catch (e) {
             failure(e);

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.100.2",
+  "version": "2.101.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/binary/downloadUrlAsFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"downloadUrlAsFile.d.ts","sourceRoot":"","sources":["../../../../src/core/binary/downloadUrlAsFile.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,uCAHW,MAAM,YACN,MAAM,QAShB"}
+{"version":3,"file":"downloadUrlAsFile.d.ts","sourceRoot":"","sources":["../../../../src/core/binary/downloadUrlAsFile.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,uCAHW,MAAM,YACN,MAAM,QAWhB"}

package/src/core/binary/downloadUrlAsFile.js

@@ -4,9 +4,11 @@
  * @param {string} filename
  */
 export function downloadUrlAsFile(url, filename) {
-    const elem = window.document.createElement('a');
+    const elem = document.createElement('a');
     elem.href = url;
     elem.download = filename;
+
+    // only elements on the dom are clickable, so we add it
     document.body.appendChild(elem);
     elem.click();
     document.body.removeChild(elem);

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":"AAiDA;;;;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,sBAehB;IAsQD;;;;;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;4BAx2B2B,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":"AAiDA;;;;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,sBAehB;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;4BA72B2B,0CAA0C;iCAOrC,uBAAuB;6BAM3B,mBAAmB;kCAFd,6BAA6B;kCAD7B,wBAAwB;4BAE9B,0BAA0B"}

package/src/engine/asset/AssetManager.js

@@ -591,7 +591,12 @@ export class AssetManager {
         try {
 
 
-            loader.load(scope, full_path, success, failure, progress);
+            const result = loader.load(scope, full_path, success, failure, progress);
+
+            if (result instanceof Promise) {
+                // allow promise responses
+                result.catch(failure);
+            }
 
         } catch (e) {
             console.error(`Loader failed on invocation. path=${path}, type=${type}`, 'Loader exception: ', e);

package/src/engine/asset/loaders/ArrayBufferLoader.d.ts

@@ -13,8 +13,9 @@ export class ArrayBufferLoader extends AssetLoader<any, any> {
     load(scope: any, path: any, success: any, failure?: {
         (...data: any[]): void;
         (message?: any, ...optionalParams: any[]): void;
-    }, progress?: typeof noop): void;
+    }, progress?: typeof noop): Promise<Asset<any>>;
 }
 import { AssetLoader } from "./AssetLoader.js";
 import { noop } from "../../../core/function/noop.js";
+import { Asset } from "../Asset.js";
 //# sourceMappingURL=ArrayBufferLoader.d.ts.map

package/src/engine/asset/loaders/ArrayBufferLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArrayBufferLoader.d.ts","sourceRoot":"","sources":["../../../../../src/engine/asset/loaders/ArrayBufferLoader.js"],"names":[],"mappings":"AAMA;IACI;;;OAGG;IACH,iCAFW,MAAM,GAAC,KAAK,GAAC,MAAM,EAa7B;IANG;;;;OAIG;IACH,yBAAsC;IAG1C;;;qCA8HC;CACJ;4BAnJ2B,kBAAkB;qBAJzB,gCAAgC"}
+{"version":3,"file":"ArrayBufferLoader.d.ts","sourceRoot":"","sources":["../../../../../src/engine/asset/loaders/ArrayBufferLoader.js"],"names":[],"mappings":"AAoFA;IACI;;;OAGG;IACH,iCAFW,MAAM,GAAC,KAAK,GAAC,MAAM,EAa7B;IANG;;;;OAIG;IACH,yBAAsC;IAG1C;;;oDAwDC;CACJ;4BA3J2B,kBAAkB;qBAJzB,gCAAgC;sBAC/B,aAAa"}

package/src/engine/asset/loaders/ArrayBufferLoader.js

@@ -4,6 +4,84 @@ import { CrossOriginConfig } from "../CORS/CrossOriginConfig.js";
 import { CrossOriginKind } from "../CORS/CrossOriginKind.js";
 import { AssetLoader } from "./AssetLoader.js";
 
+/**
+ *
+ * @param {Response} input
+ * @param {function} progress
+ * @return {Response}
+ */
+function observeResponseProgress(input, progress) {
+    let response = input
+
+
+    if (typeof ReadableStream === 'undefined' || response.body.getReader === undefined) {
+
+        return response;
+
+    }
+
+    /**
+     * @type {ReadableStreamDefaultReader<Uint8Array>}
+     */
+    const reader = response.body.getReader();
+
+    const contentLength = response.headers.get('Content-Length');
+    const total = contentLength ? parseInt(contentLength) : 0;
+    let loaded = 0;
+
+    // periodically read data into the new stream tracking while download progress
+    const stream_prototype = {
+        type: "bytes",
+        start(controller) {
+
+            pump();
+
+            function pump() {
+
+                reader.read().then(({ done, value }) => {
+
+                    if (done) {
+                        // no more data, we're done
+                        controller.close();
+                        return;
+                    }
+
+                    loaded += value.byteLength;
+
+                    progress(loaded, total);
+
+                    controller.enqueue(value);
+                    pump();
+
+                });
+
+            }
+
+        }
+
+    };
+
+    /**
+     * @type {ReadableStream}
+     */
+    let stream;
+
+    try {
+        stream = new ReadableStream(stream_prototype);
+
+        response = new Response(stream);
+    } catch (e) {
+        /*
+         Workaround for Safari bug: "TypeError: ReadableByteStreamController is not implemented"
+         By not wrapping the response we lose the ability to track progress, but that's not a critical issue in most cases
+         */
+        console.warn(e);
+    }
+
+    return response;
+
+}
+
 export class ArrayBufferLoader extends AssetLoader {
     /**
      *
@@ -22,7 +100,13 @@ export class ArrayBufferLoader extends AssetLoader {
         this.__fetch_priority = fetch_priority;
     }
 
-    load(scope, path, success, failure = console.error, progress = noop) {
+    async load(
+        scope,
+        path,
+        success,
+        failure = console.error,
+        progress = noop
+    ) {
         const coc = this.assetManager !== null ? this.assetManager.crossOriginConfig : CrossOriginConfig.default;
 
         const headers = new Headers();
@@ -37,116 +121,40 @@ export class ArrayBufferLoader extends AssetLoader {
             request.priority = this.__fetch_priority;
         }
 
-        fetch(request)
-            .then(handle_response)
-            .then(response_to_asset)
-            .catch(failure);
+        let response = await fetch(request);
 
-        /**
-         *
-         * @param {Response} response
-         * @return {Promise<void>}
-         */
-        async function response_to_asset(response) {
-            const arrayBuffer = await response.arrayBuffer();
+        if (!(response.status === 200 || response.status === 0)) {
 
-            const asset = new Asset(
-                function () {
-                    return arrayBuffer;
-                },
-                arrayBuffer.byteSize
-            );
+            throw Error(`fetch for "${response.url}" responded with ${response.status}: ${response.statusText}`);
 
-            success(asset);
         }
 
-        /**
-         *
-         * @param {Response} response
-         * @return {Response}
-         */
-        function handle_response(response) {
-            if (!(response.status === 200 || response.status === 0)) {
-
-                throw Error(`fetch for "${response.url}" responded with ${response.status}: ${response.statusText}`);
-
-            }
-
-            // Some browsers return HTTP Status 0 when using non-http protocol
-            // e.g. 'file://' or 'data://'. Handle as success.
-
-            if (response.status === 0) {
-
-                console.warn('HTTP Status 0 received.');
-
-            }
-
-            if (typeof ReadableStream === 'undefined' || response.body.getReader === undefined) {
-
-                return response;
-
-            }
+        // Some browsers return HTTP Status 0 when using non-http protocol
+        // e.g. 'file://' or 'data://'. Handle as success.
 
-            /**
-             * @type {ReadableStreamDefaultReader<Uint8Array>}
-             */
-            const reader = response.body.getReader();
+        if (response.status === 0) {
 
-            const contentLength = response.headers.get('Content-Length');
-            const total = contentLength ? parseInt(contentLength) : 0;
-            let loaded = 0;
+            console.warn('HTTP Status 0 received.');
 
-            // periodically read data into the new stream tracking while download progress
-            const stream_prototype = {
-                type: "bytes",
-                start(controller) {
-
-                    pump();
-
-                    function pump() {
-
-                        reader.read().then(({ done, value }) => {
-
-                            if (done) {
-                                // no more data, we're done
-                                controller.close();
-                                return;
-                            }
-
-                            loaded += value.byteLength;
-
-                            progress(loaded, total);
-
-                            controller.enqueue(value);
-                            pump();
-
-                        });
-
-                    }
-
-                }
-
-            };
+        }
 
-            /**
-             * @type {ReadableStream}
-             */
-            let stream;
+        try {
+            response = observeResponseProgress(response, progress);
+        } catch (e) {
+            console.warn('Failed to wrap response');
+        }
 
-            try {
-                stream = new ReadableStream(stream_prototype);
-            } catch (e) {
-                /*
-                 Workaround for Safari bug: "TypeError: ReadableByteStreamController is not implemented"
-                 By not wrapping the response we lose the ability to track progress, but that's not a critical issue in most cases
-                 */
-                console.warn(e);
-                return response;
-            }
+        const arrayBuffer = await response.arrayBuffer();
 
-            return new Response(stream);
-        }
+        const asset = new Asset(
+            function () {
+                return arrayBuffer;
+            },
+            arrayBuffer.byteSize
+        );
 
+        success(asset);
 
+        return asset;
     }
 }

package/src/engine/graphics/FrameRunner.d.ts

@@ -1,5 +1,6 @@
 /**
- *
+ * Fires a given function every frame. Typical usage is to create an instance, invoke {@link #startup} and once no longer required - invoke {@link #shutdown}
+ * Wraps {@link requestAnimationFrame}
  */
 export class FrameRunner {
     /**
@@ -13,22 +14,12 @@ export class FrameRunner {
      */
     action: Function;
     /**
-     *
-     * @type {boolean}
-     */
-    running: boolean;
-    /**
-     *
-     * @type {number}
-     */
-    animationFrameId: number;
-    /**
-     *
+     * Begins animation loop. Does nothing and returns false if already running.
      * @returns {boolean}
      */
     startup(): boolean;
     /**
-     *
+     * Stops animation loop. Does nothing and returns false if not currently running.
      * @returns {boolean}
      */
     shutdown(): boolean;
@@ -37,5 +28,6 @@ export class FrameRunner {
      * @returns {boolean}
      */
     isRunning(): boolean;
+    #private;
 }
 //# sourceMappingURL=FrameRunner.d.ts.map

package/src/engine/graphics/FrameRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FrameRunner.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics/FrameRunner.js"],"names":[],"mappings":"AAEA;;GAEG;AACH;IACI;;;OAGG;IACH,8BAgBC;IAfG;;;OAGG;IACH,iBAAoB;IACpB;;;OAGG;IACH,SAFU,OAAO,CAEG;IACpB;;;OAGG;IACH,kBAFU,MAAM,CAEU;IAG9B;;;OAGG;IACH,WAFa,OAAO,CA2BnB;IAED;;;OAGG;IACH,YAFa,OAAO,CAiBnB;IAED;;;OAGG;IACH,aAFa,OAAO,CAInB;CACJ"}
+{"version":3,"file":"FrameRunner.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics/FrameRunner.js"],"names":[],"mappings":"AAMA;;;GAGG;AACH;IAYI;;;OAGG;IACH,8BAMC;IALG;;;OAGG;IACH,iBAAoB;IAGxB;;;OAGG;IACH,WAFa,OAAO,CA2BnB;IAED;;;OAGG;IACH,YAFa,OAAO,CAiBnB;IAED;;;OAGG;IACH,aAFa,OAAO,CAInB;;CACJ"}