@galacean/engine 1.1.0-beta.0 → 1.1.0-beta.2

package/dist/browser.js

@@ -9157,12 +9157,6 @@
                 this._hookResource._addReferCount(-1);
                 this._hookResource = null;
             }
-            this.isActive = false;
-            if (this._isRoot) {
-                this._scene.removeRootEntity(this);
-            } else {
-                this._setParent(null);
-            }
             var components = this._components;
             for(var i = components.length - 1; i >= 0; i--){
                 components[i].destroy();
@@ -9172,6 +9166,12 @@
             while(children.length > 0){
                 children[0].destroy();
             }
+            if (this._isRoot) {
+                this._scene.removeRootEntity(this);
+            } else {
+                this._setParent(null);
+            }
+            this.isActive = false;
         };
         /**
        * @internal
@@ -11056,6 +11056,12 @@
         };
         return BlendState;
     }();
+    __decorate$1([
+        deepClone
+    ], BlendState.prototype, "targetBlendState", void 0);
+    __decorate$1([
+        deepClone
+    ], BlendState.prototype, "blendColor", void 0);
     /**
      * Depth state.
      */ var DepthState = /*#__PURE__*/ function() {
@@ -11434,6 +11440,18 @@
         };
         return RenderState;
     }();
+    __decorate$1([
+        deepClone
+    ], RenderState.prototype, "blendState", void 0);
+    __decorate$1([
+        deepClone
+    ], RenderState.prototype, "depthState", void 0);
+    __decorate$1([
+        deepClone
+    ], RenderState.prototype, "stencilState", void 0);
+    __decorate$1([
+        deepClone
+    ], RenderState.prototype, "rasterState", void 0);
     /**
      * Shader for rendering.
      */ var Shader = /*#__PURE__*/ function() {
@@ -17105,7 +17123,7 @@
                 program.uploadAll(program.rendererUniformBlock, renderer.shaderData);
                 program.uploadAll(program.materialUniformBlock, material.shaderData);
                 material.renderState._apply(engine, false, pass._renderStateDataMap, material.shaderData);
-                engine._hardwareRenderer.drawPrimitive(mesh, subMesh, program);
+                engine._hardwareRenderer.drawPrimitive(mesh._primitive, subMesh, program);
             }
         };
         return SpriteMaskBatcher;
@@ -21637,7 +21655,7 @@
             program.uploadAll(program.materialUniformBlock, materialShaderData);
             program.uploadUnGroupTextures();
             renderState._apply(engine, false, pass._renderStateDataMap, materialShaderData);
-            rhi.drawPrimitive(mesh, mesh.subMesh, program);
+            rhi.drawPrimitive(mesh._primitive, mesh.subMesh, program);
             cameraShaderData.setMatrix(RenderContext.vpMatrixProperty, originViewProjMatrix);
         };
         _create_class$3(Sky, [
@@ -24992,7 +25010,7 @@
             program.uploadAll(program.materialUniformBlock, material.shaderData);
             program.uploadUnGroupTextures();
             (pass._renderState || material.renderState)._apply(engine, false, pass._renderStateDataMap, material.shaderData);
-            rhi.drawPrimitive(mesh, mesh.subMesh, program);
+            rhi.drawPrimitive(mesh._primitive, mesh.subMesh, program);
         };
         _proto._callRender = function _callRender(context) {
             var engine = context.camera.engine;
@@ -30787,7 +30805,6 @@
             var state = playState.state;
             var clipDuration = state.clip.length;
             if (this.speed * state.speed >= 0) {
-                console.log(999, clipTime, lastClipTime);
                 if (clipTime < lastClipTime) {
                     this._checkSubTransition(playState, transitions, layerIndex, lastClipTime, state.clipEndTime * clipDuration);
                     playState.currentTransitionIndex = 0;
@@ -39300,20 +39317,56 @@
         return AbstractTranscoder;
     }();
     /** @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 onRuntimeInitialized() {
+                            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:
@@ -39330,76 +39383,24 @@
                     return 7;
             }
         };
-        var init = function init(wasmBinary) {
-            transcodePromise = new Promise(function(resolve, reject) {
-                var BasisModule = {
-                    wasmBinary: wasmBinary,
-                    onRuntimeInitialized: function onRuntimeInitialized() {
-                        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 cleanup = function cleanup() {
-                ktx2File.close();
-                ktx2File.delete();
-            };
-            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;
+        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";
@@ -39425,31 +39426,52 @@
             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
         };
     }
     /** @internal */ var BinomialLLCTranscoder = /*#__PURE__*/ function(AbstractTranscoder1) {
@@ -39469,23 +39491,49 @@
                 })
             ]).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);
@@ -39709,7 +39757,7 @@
         _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();
@@ -42858,7 +42906,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.0";
+    var version = "1.1.0-beta.2";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);