@woosh/meep-engine 2.73.0 → 2.75.0

package/src/core/process/worker/OnDemandWorkerManager.js

@@ -1,4 +1,4 @@
-import {assert} from "../../assert.js";
+import { assert } from "../../assert.js";
 
 export class OnDemandWorkerManager {
 
@@ -35,6 +35,10 @@ export class OnDemandWorkerManager {
         this.worker = worker;
     }
 
+    /**
+     * In milliseconds
+     * @param {number} v
+     */
     setTimeout(v) {
         assert.isNonNegativeInteger(v, 'v');
 

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

@@ -1,8 +1,8 @@
+import { noop } from "../../../core/function/Functions.js";
 import { Asset } from "../Asset.js";
-import { AssetLoader } from "./AssetLoader.js";
-import { CrossOriginKind } from "../CORS/CrossOriginKind.js";
 import { CrossOriginConfig } from "../CORS/CrossOriginConfig.js";
-import { noop } from "../../../core/function/Functions.js";
+import { CrossOriginKind } from "../CORS/CrossOriginKind.js";
+import { AssetLoader } from "./AssetLoader.js";
 
 export class ArrayBufferLoader extends AssetLoader {
     /**
@@ -90,33 +90,31 @@ export class ArrayBufferLoader extends AssetLoader {
             const reader = response.body.getReader();
             const contentLength = response.headers.get('Content-Length');
             const total = contentLength ? parseInt(contentLength) : 0;
-            const lengthComputable = total !== 0;
             let loaded = 0;
 
             // periodically read data into the new stream tracking while download progress
             const stream = new ReadableStream({
+                type: "bytes",
                 start(controller) {
 
-                    readData();
+                    pump();
 
-                    function readData() {
+                    function pump() {
 
                         reader.read().then(({ done, value }) => {
 
                             if (done) {
-
+                                // no more data, we're done
                                 controller.close();
+                                return;
+                            }
 
-                            } else {
-
-                                loaded += value.byteLength;
-
-                                progress(loaded, length);
+                            loaded += value.byteLength;
 
-                                controller.enqueue(value);
-                                readData();
+                            progress(loaded, total);
 
-                            }
+                            controller.enqueue(value);
+                            pump();
 
                         });
 

package/src/engine/asset/loaders/image/ImageDecoderWorker.js

@@ -23,7 +23,7 @@ async function decode_png(png_bytes) {
             width,
             height,
             itemSize: uint_channels.itemSize,
-            bitDepth: png.bitDepth
+            bitDepth: 8
         });
     });
 }

package/src/engine/asset/loaders/image/ImageRGBADataLoader.js

@@ -1,12 +1,11 @@
-import { AssetLoader } from "../AssetLoader.js";
-import { GameAssetType } from "../../GameAssetType.js";
+import { computeFileExtension } from "../../../../core/path/computeFileExtension.js";
 import { convertTexture2Sampler2D } from "../../../graphics/texture/sampler/convertTexture2Sampler2D.js";
-import { ImageRGBADataAsset } from "./ImageRGBADataAsset.js";
+import { GameAssetType } from "../../GameAssetType.js";
 import { ArrayBufferLoader } from "../ArrayBufferLoader.js";
+import { AssetLoader } from "../AssetLoader.js";
 import { CodecWithFallback } from "./codec/CodecWithFallback.js";
 import { ThreadedImageDecoder } from "./codec/ThreadedImageDecoder.js";
-import { NativeImageDecoder } from "./codec/NativeImageDecoder.js";
-import { computeFileExtension } from "../../../../core/path/computeFileExtension.js";
+import { ImageRGBADataAsset } from "./ImageRGBADataAsset.js";
 
 const ASSET_TYPE_ARRAY_BUFFER = "arraybuffer";
 
@@ -16,7 +15,7 @@ export class ImageRGBADataLoader extends AssetLoader {
 
         this.decoder = new CodecWithFallback(
             new ThreadedImageDecoder(),
-            new NativeImageDecoder()
+            // new NativeImageDecoder()
         );
     }
 
@@ -58,7 +57,6 @@ export class ImageRGBADataLoader extends AssetLoader {
 
         const bitmap = await this.__decode_via_worker(path, scope);
 
-
         let data;
 
         const bitDepth = bitmap.bitDepth;

package/src/engine/asset/loaders/image/codec/NativeImageDecoder.js

@@ -29,7 +29,8 @@ export class NativeImageDecoder extends Codec {
         const image = new Image();
 
         // convert binary data to image URL that we can load
-        const url = URL.createObjectURL(new Blob([data]));
+        const blob = new Blob([data]);
+        const url = URL.createObjectURL(blob);
 
         image.src = url;
 

package/src/engine/asset/loaders/image/codec/ThreadedImageDecoder.js

@@ -1,7 +1,7 @@
-import { Codec } from "./Codec.js";
-import WorkerBuilder from "../../../../../core/process/worker/WorkerBuilder.js";
 import { OnDemandWorkerManager } from "../../../../../core/process/worker/OnDemandWorkerManager.js";
+import WorkerBuilder from "../../../../../core/process/worker/WorkerBuilder.js";
 import { PNG_HEADER_BYTES } from "../png/PNG_HEADER_BYTES.js";
+import { Codec } from "./Codec.js";
 
 export class ThreadedImageDecoder extends Codec {
     constructor() {
@@ -21,7 +21,7 @@ export class ThreadedImageDecoder extends Codec {
          */
         this.worker = new OnDemandWorkerManager(workerBuilder.build());
 
-        this.worker.setTimeout(200);
+        this.worker.setTimeout(1200);
     }
 
     async test(data) {
@@ -35,8 +35,7 @@ export class ThreadedImageDecoder extends Codec {
         return true;
     }
 
-    async decode(data) {
-        const result = await this.worker.request('decode', [data.buffer]);
-        return result;
+    decode(data) {
+        return this.worker.request('decode', [data.buffer]);
     }
 }