@galacean/engine-loader 1.1.0-beta.1 → 1.1.0-beta.2

package/dist/miniprogram.js

@@ -2430,20 +2430,56 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
 }();
 
 /** @internal */ function TranscodeWorkerCode$1() {
-    var concat = function concat(arrays) {
-        if (arrays.length === 1) return arrays[0];
-        var totalByteLength = 0;
-        for(var i = 0; i < arrays.length; i++){
-            totalByteLength += arrays[i].byteLength;
+    self.onmessage = function onmessage(event) {
+        var message = event.data;
+        switch(message.type){
+            case "init":
+                init(message.transcoderWasm).then(function() {
+                    self.postMessage("init-completed");
+                }).catch(function(e) {
+                    return self.postMessage({
+                        error: e
+                    });
+                });
+                break;
+            case "transcode":
+                init().then(function(KTX2File) {
+                    var result = transcode(message.buffer, message.format, KTX2File);
+                    // @ts-ignore
+                    result.type = "transcoded";
+                    self.postMessage(result);
+                }).catch(function(e) {
+                    return self.postMessage({
+                        error: e
+                    });
+                });
+                break;
         }
-        var result = new Uint8Array(totalByteLength);
-        var byteOffset = 0;
-        for(var i1 = 0; i1 < arrays.length; i1++){
-            result.set(arrays[i1], byteOffset);
-            byteOffset += arrays[i1].byteLength;
+    };
+}
+var _init = function init() {
+    var initPromise;
+    return function init(wasmBinary) {
+        if (!initPromise) {
+            initPromise = new Promise(function(resolve, reject) {
+                var BasisModule = {
+                    wasmBinary: wasmBinary,
+                    onRuntimeInitialized: function() {
+                        return resolve(BasisModule);
+                    },
+                    onAbort: reject
+                };
+                self["BASIS"](BasisModule);
+            }).then(function(BasisModule) {
+                BasisModule.initializeBasis();
+                return BasisModule.KTX2File;
+            });
         }
-        return result;
+        return initPromise;
     };
+};
+var init = _init();
+function transcode(buffer, targetFormat, KTX2File) {
     var getTranscodeFormatFromTarget = function getTranscodeFormatFromTarget(target, hasAlpha) {
         switch(target){
             case 2:
@@ -2460,76 +2496,24 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
                 return 7;
         }
     };
-    var init = function init(wasmBinary) {
-        transcodePromise = new Promise(function(resolve, reject) {
-            var BasisModule = {
-                wasmBinary: wasmBinary,
-                onRuntimeInitialized: function() {
-                    return resolve(BasisModule);
-                },
-                onAbort: reject
-            };
-            self["BASIS"](BasisModule);
-        }).then(function(BasisModule) {
-            BasisModule.initializeBasis();
-            return BasisModule.KTX2File;
-        });
-        return transcodePromise;
-    };
-    var transcode = function transcode(buffer, targetFormat, KTX2File) {
-        var ktx2File = new KTX2File(new Uint8Array(buffer));
-        function cleanup() {
-            ktx2File.close();
-            ktx2File.delete();
-        }
-        if (!ktx2File.isValid()) {
-            cleanup();
-            throw new Error("Invalid or unsupported .ktx2 file");
-        }
-        var width = ktx2File.getWidth();
-        var height = ktx2File.getHeight();
-        var layerCount = ktx2File.getLayers() || 1;
-        var levelCount = ktx2File.getLevels();
-        var hasAlpha = ktx2File.getHasAlpha();
-        var faceCount = ktx2File.getFaces();
-        var format = getTranscodeFormatFromTarget(targetFormat, hasAlpha);
-        var faces = new Array(faceCount);
-        for(var face = 0; face < faceCount; face++){
-            var mipmaps = new Array(levelCount);
-            for(var mip = 0; mip < levelCount; mip++){
-                var layerMips = new Array(layerCount);
-                var mipWidth = void 0, mipHeight = void 0;
-                for(var layer = 0; layer < layerCount; layer++){
-                    var levelInfo = ktx2File.getImageLevelInfo(mip, layer, face);
-                    mipWidth = levelInfo.origWidth;
-                    mipHeight = levelInfo.origHeight;
-                    var dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, format));
-                    var status = ktx2File.transcodeImage(dst, mip, layer, face, format, 0, -1, -1);
-                    if (!status) {
-                        cleanup();
-                        throw new Error("transcodeImage failed.");
-                    }
-                    layerMips[layer] = dst;
-                }
-                mipmaps[mip] = {
-                    data: concat(layerMips),
-                    width: mipWidth,
-                    height: mipHeight
-                };
-            }
-            faces[face] = mipmaps;
+    var concat = function concat(arrays) {
+        if (arrays.length === 1) return arrays[0];
+        var totalByteLength = 0;
+        for(var i = 0; i < arrays.length; i++){
+            totalByteLength += arrays[i].byteLength;
         }
-        cleanup();
-        return {
-            faces: faces,
-            width: width,
-            height: height,
-            hasAlpha: hasAlpha,
-            faceCount: faceCount,
-            format: format
-        };
+        var result = new Uint8Array(totalByteLength);
+        var byteOffset = 0;
+        for(var i1 = 0; i1 < arrays.length; i1++){
+            result.set(arrays[i1], byteOffset);
+            byteOffset += arrays[i1].byteLength;
+        }
+        return result;
+    };
+    var cleanup = function cleanup() {
+        ktx2File.close();
+        ktx2File.delete();
     };
-    var transcodePromise;
     var BasisFormat;
     (function(BasisFormat) {
         BasisFormat[BasisFormat["ETC1"] = 0] = "ETC1";
@@ -2555,31 +2539,52 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
         TargetFormat[TargetFormat["RG8"] = 6] = "RG8";
         TargetFormat[TargetFormat["RGBA8"] = 7] = "RGBA8";
     })(TargetFormat || (TargetFormat = {}));
-    self.onmessage = function onmessage(event) {
-        var message = event.data;
-        switch(message.type){
-            case "init":
-                init(message.transcoderWasm).then(function() {
-                    return self.postMessage("init-completed");
-                }).catch(function(e) {
-                    return self.postMessage({
-                        error: e
-                    });
-                });
-                break;
-            case "transcode":
-                transcodePromise.then(function(KTX2File) {
-                    var result = transcode(message.buffer, message.format, KTX2File);
-                    // @ts-ignore
-                    result.type = "transcoded";
-                    self.postMessage(result);
-                }).catch(function(e) {
-                    return self.postMessage({
-                        error: e
-                    });
-                });
-                break;
+    var ktx2File = new KTX2File(new Uint8Array(buffer));
+    if (!ktx2File.isValid()) {
+        cleanup();
+        throw new Error("Invalid or unsupported .ktx2 file");
+    }
+    var width = ktx2File.getWidth();
+    var height = ktx2File.getHeight();
+    var layerCount = ktx2File.getLayers() || 1;
+    var levelCount = ktx2File.getLevels();
+    var hasAlpha = ktx2File.getHasAlpha();
+    var faceCount = ktx2File.getFaces();
+    var format = getTranscodeFormatFromTarget(targetFormat, hasAlpha);
+    var faces = new Array(faceCount);
+    for(var face = 0; face < faceCount; face++){
+        var mipmaps = new Array(levelCount);
+        for(var mip = 0; mip < levelCount; mip++){
+            var layerMips = new Array(layerCount);
+            var mipWidth = void 0, mipHeight = void 0;
+            for(var layer = 0; layer < layerCount; layer++){
+                var levelInfo = ktx2File.getImageLevelInfo(mip, layer, face);
+                mipWidth = levelInfo.origWidth;
+                mipHeight = levelInfo.origHeight;
+                var dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, format));
+                var status = ktx2File.transcodeImage(dst, mip, layer, face, format, 0, -1, -1);
+                if (!status) {
+                    cleanup();
+                    throw new Error("transcodeImage failed.");
+                }
+                layerMips[layer] = dst;
+            }
+            mipmaps[mip] = {
+                data: concat(layerMips),
+                width: mipWidth,
+                height: mipHeight
+            };
         }
+        faces[face] = mipmaps;
+    }
+    cleanup();
+    return {
+        faces: faces,
+        width: width,
+        height: height,
+        hasAlpha: hasAlpha,
+        faceCount: faceCount,
+        format: format
     };
 }
 
@@ -2600,23 +2605,49 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
             })
         ]).then(function(param) {
             var jsCode = param[0], wasmBuffer = param[1];
-            var funcCode = TranscodeWorkerCode$1.toString();
-            var transcodeString = funcCode.substring(funcCode.indexOf("{"), funcCode.lastIndexOf("}") + 1);
-            var workerCode = "\n      " + jsCode + "\n      " + transcodeString + "\n      ";
-            var workerURL = engineMiniprogramAdapter.URL.createObjectURL(new engineMiniprogramAdapter.Blob([
-                workerCode
-            ], {
-                type: "application/javascript"
-            }));
-            return _this._createTranscodePool(workerURL, wasmBuffer);
+            if (_this.workerLimitCount === 0) {
+                return new Promise(function(resolve, reject) {
+                    var scriptDom = engineMiniprogramAdapter.document.createElement("script");
+                    scriptDom.src = engineMiniprogramAdapter.URL.createObjectURL(new engineMiniprogramAdapter.Blob([
+                        jsCode
+                    ], {
+                        type: "application/javascript"
+                    }));
+                    engineMiniprogramAdapter.document.body.appendChild(scriptDom);
+                    scriptDom.onload = function() {
+                        init(wasmBuffer).then(function() {
+                            resolve(null);
+                        });
+                    };
+                    scriptDom.onerror = function() {
+                        reject();
+                    };
+                });
+            } else {
+                var funcCode = TranscodeWorkerCode$1.toString();
+                var transcodeString = funcCode.substring(funcCode.indexOf("{"), funcCode.lastIndexOf("}") + 1);
+                var workerCode = "\n        " + jsCode + "\n        var init = (" + _init.toString() + ")();\n        " + transcode.toString() + "\n        " + transcodeString + "\n        ";
+                var workerURL = engineMiniprogramAdapter.URL.createObjectURL(new engineMiniprogramAdapter.Blob([
+                    workerCode
+                ], {
+                    type: "application/javascript"
+                }));
+                return _this._createTranscodePool(workerURL, wasmBuffer);
+            }
         });
     };
-    _proto.transcode = function transcode(buffer, format) {
-        return this._transcodeWorkerPool.postMessage({
-            buffer: buffer,
-            format: format,
-            type: "transcode"
-        });
+    _proto.transcode = function transcode1(buffer, format) {
+        if (this.workerLimitCount === 0) {
+            return init().then(function(KTX2File) {
+                return transcode(buffer, format, KTX2File);
+            });
+        } else {
+            return this._transcodeWorkerPool.postMessage({
+                buffer: buffer,
+                format: format,
+                type: "transcode"
+            });
+        }
     };
     return BinomialLLCTranscoder;
 }(AbstractTranscoder);
@@ -2844,7 +2875,7 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
     _proto.initialize = function initialize(engine, configuration) {
         if (configuration.ktx2Loader) {
             var options = configuration.ktx2Loader;
-            if (this._isKhronosSupported(options.priorityFormats, engine)) {
+            if (this._isKhronosSupported(options.priorityFormats, engine) && options.workerCount !== 0) {
                 return exports.KTX2Loader._getKhronosTranscoder(options.workerCount).init();
             } else {
                 return exports.KTX2Loader._getBinomialLLCTranscoder(options.workerCount).init();

package/dist/module.js

@@ -2425,20 +2425,56 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
 }();
 
 /** @internal */ function TranscodeWorkerCode$1() {
-    var concat = function concat(arrays) {
-        if (arrays.length === 1) return arrays[0];
-        var totalByteLength = 0;
-        for(var i = 0; i < arrays.length; i++){
-            totalByteLength += arrays[i].byteLength;
+    self.onmessage = function onmessage(event) {
+        var message = event.data;
+        switch(message.type){
+            case "init":
+                init(message.transcoderWasm).then(function() {
+                    self.postMessage("init-completed");
+                }).catch(function(e) {
+                    return self.postMessage({
+                        error: e
+                    });
+                });
+                break;
+            case "transcode":
+                init().then(function(KTX2File) {
+                    var result = transcode(message.buffer, message.format, KTX2File);
+                    // @ts-ignore
+                    result.type = "transcoded";
+                    self.postMessage(result);
+                }).catch(function(e) {
+                    return self.postMessage({
+                        error: e
+                    });
+                });
+                break;
         }
-        var result = new Uint8Array(totalByteLength);
-        var byteOffset = 0;
-        for(var i1 = 0; i1 < arrays.length; i1++){
-            result.set(arrays[i1], byteOffset);
-            byteOffset += arrays[i1].byteLength;
+    };
+}
+var _init = function init() {
+    var initPromise;
+    return function init(wasmBinary) {
+        if (!initPromise) {
+            initPromise = new Promise(function(resolve, reject) {
+                var BasisModule = {
+                    wasmBinary: wasmBinary,
+                    onRuntimeInitialized: function() {
+                        return resolve(BasisModule);
+                    },
+                    onAbort: reject
+                };
+                self["BASIS"](BasisModule);
+            }).then(function(BasisModule) {
+                BasisModule.initializeBasis();
+                return BasisModule.KTX2File;
+            });
         }
-        return result;
+        return initPromise;
     };
+};
+var init = _init();
+function transcode(buffer, targetFormat, KTX2File) {
     var getTranscodeFormatFromTarget = function getTranscodeFormatFromTarget(target, hasAlpha) {
         switch(target){
             case 2:
@@ -2455,76 +2491,24 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
                 return 7;
         }
     };
-    var init = function init(wasmBinary) {
-        transcodePromise = new Promise(function(resolve, reject) {
-            var BasisModule = {
-                wasmBinary: wasmBinary,
-                onRuntimeInitialized: function() {
-                    return resolve(BasisModule);
-                },
-                onAbort: reject
-            };
-            self["BASIS"](BasisModule);
-        }).then(function(BasisModule) {
-            BasisModule.initializeBasis();
-            return BasisModule.KTX2File;
-        });
-        return transcodePromise;
-    };
-    var transcode = function transcode(buffer, targetFormat, KTX2File) {
-        var ktx2File = new KTX2File(new Uint8Array(buffer));
-        function cleanup() {
-            ktx2File.close();
-            ktx2File.delete();
-        }
-        if (!ktx2File.isValid()) {
-            cleanup();
-            throw new Error("Invalid or unsupported .ktx2 file");
-        }
-        var width = ktx2File.getWidth();
-        var height = ktx2File.getHeight();
-        var layerCount = ktx2File.getLayers() || 1;
-        var levelCount = ktx2File.getLevels();
-        var hasAlpha = ktx2File.getHasAlpha();
-        var faceCount = ktx2File.getFaces();
-        var format = getTranscodeFormatFromTarget(targetFormat, hasAlpha);
-        var faces = new Array(faceCount);
-        for(var face = 0; face < faceCount; face++){
-            var mipmaps = new Array(levelCount);
-            for(var mip = 0; mip < levelCount; mip++){
-                var layerMips = new Array(layerCount);
-                var mipWidth = void 0, mipHeight = void 0;
-                for(var layer = 0; layer < layerCount; layer++){
-                    var levelInfo = ktx2File.getImageLevelInfo(mip, layer, face);
-                    mipWidth = levelInfo.origWidth;
-                    mipHeight = levelInfo.origHeight;
-                    var dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, format));
-                    var status = ktx2File.transcodeImage(dst, mip, layer, face, format, 0, -1, -1);
-                    if (!status) {
-                        cleanup();
-                        throw new Error("transcodeImage failed.");
-                    }
-                    layerMips[layer] = dst;
-                }
-                mipmaps[mip] = {
-                    data: concat(layerMips),
-                    width: mipWidth,
-                    height: mipHeight
-                };
-            }
-            faces[face] = mipmaps;
+    var concat = function concat(arrays) {
+        if (arrays.length === 1) return arrays[0];
+        var totalByteLength = 0;
+        for(var i = 0; i < arrays.length; i++){
+            totalByteLength += arrays[i].byteLength;
         }
-        cleanup();
-        return {
-            faces: faces,
-            width: width,
-            height: height,
-            hasAlpha: hasAlpha,
-            faceCount: faceCount,
-            format: format
-        };
+        var result = new Uint8Array(totalByteLength);
+        var byteOffset = 0;
+        for(var i1 = 0; i1 < arrays.length; i1++){
+            result.set(arrays[i1], byteOffset);
+            byteOffset += arrays[i1].byteLength;
+        }
+        return result;
+    };
+    var cleanup = function cleanup() {
+        ktx2File.close();
+        ktx2File.delete();
     };
-    var transcodePromise;
     var BasisFormat;
     (function(BasisFormat) {
         BasisFormat[BasisFormat["ETC1"] = 0] = "ETC1";
@@ -2550,31 +2534,52 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
         TargetFormat[TargetFormat["RG8"] = 6] = "RG8";
         TargetFormat[TargetFormat["RGBA8"] = 7] = "RGBA8";
     })(TargetFormat || (TargetFormat = {}));
-    self.onmessage = function onmessage(event) {
-        var message = event.data;
-        switch(message.type){
-            case "init":
-                init(message.transcoderWasm).then(function() {
-                    return self.postMessage("init-completed");
-                }).catch(function(e) {
-                    return self.postMessage({
-                        error: e
-                    });
-                });
-                break;
-            case "transcode":
-                transcodePromise.then(function(KTX2File) {
-                    var result = transcode(message.buffer, message.format, KTX2File);
-                    // @ts-ignore
-                    result.type = "transcoded";
-                    self.postMessage(result);
-                }).catch(function(e) {
-                    return self.postMessage({
-                        error: e
-                    });
-                });
-                break;
+    var ktx2File = new KTX2File(new Uint8Array(buffer));
+    if (!ktx2File.isValid()) {
+        cleanup();
+        throw new Error("Invalid or unsupported .ktx2 file");
+    }
+    var width = ktx2File.getWidth();
+    var height = ktx2File.getHeight();
+    var layerCount = ktx2File.getLayers() || 1;
+    var levelCount = ktx2File.getLevels();
+    var hasAlpha = ktx2File.getHasAlpha();
+    var faceCount = ktx2File.getFaces();
+    var format = getTranscodeFormatFromTarget(targetFormat, hasAlpha);
+    var faces = new Array(faceCount);
+    for(var face = 0; face < faceCount; face++){
+        var mipmaps = new Array(levelCount);
+        for(var mip = 0; mip < levelCount; mip++){
+            var layerMips = new Array(layerCount);
+            var mipWidth = void 0, mipHeight = void 0;
+            for(var layer = 0; layer < layerCount; layer++){
+                var levelInfo = ktx2File.getImageLevelInfo(mip, layer, face);
+                mipWidth = levelInfo.origWidth;
+                mipHeight = levelInfo.origHeight;
+                var dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, format));
+                var status = ktx2File.transcodeImage(dst, mip, layer, face, format, 0, -1, -1);
+                if (!status) {
+                    cleanup();
+                    throw new Error("transcodeImage failed.");
+                }
+                layerMips[layer] = dst;
+            }
+            mipmaps[mip] = {
+                data: concat(layerMips),
+                width: mipWidth,
+                height: mipHeight
+            };
         }
+        faces[face] = mipmaps;
+    }
+    cleanup();
+    return {
+        faces: faces,
+        width: width,
+        height: height,
+        hasAlpha: hasAlpha,
+        faceCount: faceCount,
+        format: format
     };
 }
 
@@ -2595,23 +2600,49 @@ var AbstractTranscoder = /*#__PURE__*/ function() {
             })
         ]).then(function(param) {
             var jsCode = param[0], wasmBuffer = param[1];
-            var funcCode = TranscodeWorkerCode$1.toString();
-            var transcodeString = funcCode.substring(funcCode.indexOf("{"), funcCode.lastIndexOf("}") + 1);
-            var workerCode = "\n      " + jsCode + "\n      " + transcodeString + "\n      ";
-            var workerURL = URL.createObjectURL(new Blob([
-                workerCode
-            ], {
-                type: "application/javascript"
-            }));
-            return _this._createTranscodePool(workerURL, wasmBuffer);
+            if (_this.workerLimitCount === 0) {
+                return new Promise(function(resolve, reject) {
+                    var scriptDom = document.createElement("script");
+                    scriptDom.src = URL.createObjectURL(new Blob([
+                        jsCode
+                    ], {
+                        type: "application/javascript"
+                    }));
+                    document.body.appendChild(scriptDom);
+                    scriptDom.onload = function() {
+                        init(wasmBuffer).then(function() {
+                            resolve(null);
+                        });
+                    };
+                    scriptDom.onerror = function() {
+                        reject();
+                    };
+                });
+            } else {
+                var funcCode = TranscodeWorkerCode$1.toString();
+                var transcodeString = funcCode.substring(funcCode.indexOf("{"), funcCode.lastIndexOf("}") + 1);
+                var workerCode = "\n        " + jsCode + "\n        var init = (" + _init.toString() + ")();\n        " + transcode.toString() + "\n        " + transcodeString + "\n        ";
+                var workerURL = URL.createObjectURL(new Blob([
+                    workerCode
+                ], {
+                    type: "application/javascript"
+                }));
+                return _this._createTranscodePool(workerURL, wasmBuffer);
+            }
         });
     };
-    _proto.transcode = function transcode(buffer, format) {
-        return this._transcodeWorkerPool.postMessage({
-            buffer: buffer,
-            format: format,
-            type: "transcode"
-        });
+    _proto.transcode = function transcode1(buffer, format) {
+        if (this.workerLimitCount === 0) {
+            return init().then(function(KTX2File) {
+                return transcode(buffer, format, KTX2File);
+            });
+        } else {
+            return this._transcodeWorkerPool.postMessage({
+                buffer: buffer,
+                format: format,
+                type: "transcode"
+            });
+        }
     };
     return BinomialLLCTranscoder;
 }(AbstractTranscoder);
@@ -2839,7 +2870,7 @@ var KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
     _proto.initialize = function initialize(engine, configuration) {
         if (configuration.ktx2Loader) {
             var options = configuration.ktx2Loader;
-            if (this._isKhronosSupported(options.priorityFormats, engine)) {
+            if (this._isKhronosSupported(options.priorityFormats, engine) && options.workerCount !== 0) {
                 return KTX2Loader._getKhronosTranscoder(options.workerCount).init();
             } else {
                 return KTX2Loader._getBinomialLLCTranscoder(options.workerCount).init();