@galacean/engine 1.1.0-beta.10 → 1.1.0-beta.12

package/dist/browser.js

@@ -20610,6 +20610,7 @@
                             case "pointercancel":
                                 pointer.phase = exports.PointerPhase.Leave;
                                 pointer._firePointerExitAndEnter(null);
+                                break;
                         }
                     }
                     events.length = 0;
@@ -20737,7 +20738,7 @@
             var point = PointerManager._tempPoint, ray = PointerManager._tempRay, hitResult = PointerManager._tempHitResult;
             for(var i = scenes.length - 1; i >= 0; i--){
                 var scene = scenes[i];
-                if (scene.destroyed) {
+                if (!scene.isActive || scene.destroyed) {
                     continue;
                 }
                 var cameras = scene._activeCameras;
@@ -21268,7 +21269,7 @@
      * @internal
      */ var ShaderProgramPool = /*#__PURE__*/ function() {
         var ShaderProgramPool = function ShaderProgramPool() {
-            this._cacheHierarchy = 1;
+            this._cacheHierarchyDepth = 1;
             this._cacheMap = Object.create(null);
         };
         var _proto = ShaderProgramPool.prototype;
@@ -21279,12 +21280,14 @@
        */ _proto.get = function get(macros) {
             var cacheMap = this._cacheMap;
             var maskLength = macros._length;
-            if (maskLength > this._cacheHierarchy) {
-                this._resizeCacheMapHierarchy(cacheMap, 0, maskLength);
+            var cacheHierarchyDepth = this._cacheHierarchyDepth;
+            if (maskLength > cacheHierarchyDepth) {
+                this._resizeCacheMapHierarchy(cacheMap, 0, cacheHierarchyDepth, maskLength - cacheHierarchyDepth);
+                this._cacheHierarchyDepth = maskLength;
             }
             var mask = macros._mask;
             var endIndex = macros._length - 1;
-            var maxEndIndex = this._cacheHierarchy - 1;
+            var maxEndIndex = this._cacheHierarchyDepth - 1;
             for(var i = 0; i < maxEndIndex; i++){
                 var subMask = endIndex < i ? 0 : mask[i];
                 var subCacheShaders = cacheMap[subMask];
@@ -21309,25 +21312,21 @@
        */ _proto.cache = function cache(shaderProgram) {
             this._lastQueryMap[this._lastQueryKey] = shaderProgram;
         };
-        _proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, resizeLength) {
-            // only expand but not shrink.
-            var end = this._cacheHierarchy - 1;
-            if (hierarchy == end) {
+        _proto._resizeCacheMapHierarchy = function _resizeCacheMapHierarchy(cacheMap, hierarchy, currentHierarchy, increaseHierarchy) {
+            // Only expand but not shrink
+            if (hierarchy == currentHierarchy - 1) {
                 for(var k in cacheMap){
                     var shader = cacheMap[k];
                     var subCacheMap = cacheMap;
-                    for(var i = 0, n = resizeLength - end; i < n; i++){
-                        if (i == n - 1) {
-                            subCacheMap[0] = shader;
-                        } else {
-                            subCacheMap = subCacheMap[i == 0 ? k : 0] = Object.create(null);
-                        }
+                    for(var i = 0; i < increaseHierarchy; i++){
+                        subCacheMap[i == 0 ? k : 0] = subCacheMap = Object.create(null);
                     }
+                    subCacheMap[0] = shader;
                 }
-                this._cacheHierarchy = resizeLength;
             } else {
+                hierarchy++;
                 for(var k1 in cacheMap){
-                    this._resizeCacheMapHierarchy(cacheMap[k1], ++hierarchy, resizeLength);
+                    this._resizeCacheMapHierarchy(cacheMap[k1], hierarchy, currentHierarchy, increaseHierarchy);
                 }
             }
         };
@@ -21446,57 +21445,56 @@
             this._textRenderDataPool.resetPool();
             var _this = this, inputManager = _this.inputManager, physicsInitialized = _this._physicsInitialized;
             inputManager._update();
-            var loopScenes = this._sceneManager._scenes.getLoopArray();
-            var sceneCount = loopScenes.length;
+            var scenes = this._sceneManager._scenes.getLoopArray();
+            var sceneCount = scenes.length;
             // Sort cameras and fire script `onStart`
             for(var i = 0; i < sceneCount; i++){
-                var scene = loopScenes[i];
-                if (scene.destroyed) continue;
+                var scene = scenes[i];
+                if (!scene.isActive || scene.destroyed) continue;
                 scene._cameraNeedSorting && scene._sortCameras();
                 scene._componentsManager.callScriptOnStart();
             }
             // Update physics and fire `onPhysicsUpdate`
             if (physicsInitialized) {
                 for(var i1 = 0; i1 < sceneCount; i1++){
-                    var scene1 = loopScenes[i1];
-                    if (scene1.destroyed) continue;
+                    var scene1 = scenes[i1];
+                    if (!scene1.isActive || scene1.destroyed) continue;
                     scene1.physics._update(deltaTime);
                 }
             }
             // Fire `onPointerXX`
-            physicsInitialized && inputManager._firePointerScript(loopScenes);
+            physicsInitialized && inputManager._firePointerScript(scenes);
             // Fire `onUpdate`
             for(var i2 = 0; i2 < sceneCount; i2++){
-                var scene2 = loopScenes[i2];
-                if (scene2.destroyed) continue;
+                var scene2 = scenes[i2];
+                if (!scene2.isActive || scene2.destroyed) continue;
                 scene2._componentsManager.callScriptOnUpdate(deltaTime);
             }
             // Update `Animator` logic
             for(var i3 = 0; i3 < sceneCount; i3++){
-                var scene3 = loopScenes[i3];
-                if (scene3.destroyed) continue;
+                var scene3 = scenes[i3];
+                if (!scene3.isActive || scene3.destroyed) continue;
                 scene3._componentsManager.callAnimationUpdate(deltaTime);
             }
             // Fire `onLateUpdate`
             for(var i4 = 0; i4 < sceneCount; i4++){
-                var scene4 = loopScenes[i4];
-                if (scene4.destroyed) continue;
+                var scene4 = scenes[i4];
+                if (!scene4.isActive || scene4.destroyed) continue;
                 scene4._componentsManager.callScriptOnLateUpdate(deltaTime);
             }
             // Render scene and fire `onBeginRender` and `onEndRender`
             if (!this._isDeviceLost) {
-                this._render(loopScenes);
-            }
-            // Handling invalid scripts and fire `onDestroy`
-            for(var i5 = 0; i5 < sceneCount; i5++){
-                var scene5 = loopScenes[i5];
-                if (scene5.destroyed) continue;
-                if (!this._waitingDestroy) {
-                    scene5._componentsManager.handlingInvalidScripts();
-                }
+                this._render(scenes);
             }
             if (this._waitingDestroy) {
                 this._destroy();
+            } else {
+                // Handling invalid scripts and fire `onDestroy`
+                for(var i5 = 0; i5 < sceneCount; i5++){
+                    var scene5 = scenes[i5];
+                    if (!scene5.isActive || scene5.destroyed) continue;
+                    scene5._componentsManager.handlingInvalidScripts();
+                }
             }
             if (this._waitingGC) {
                 this._gc();
@@ -21575,19 +21573,19 @@
         };
         /**
        * @internal
-       */ _proto._render = function _render(loopScenes) {
+       */ _proto._render = function _render(scenes) {
             // Update `Renderer` logic and shader data
-            for(var i = 0, n = loopScenes.length; i < n; i++){
-                var scene = loopScenes[i];
-                if (scene.destroyed) continue;
-                var deltaTime = this.time.deltaTime;
+            var deltaTime = this.time.deltaTime;
+            for(var i = 0, n = scenes.length; i < n; i++){
+                var scene = scenes[i];
+                if (!scene.isActive || scene.destroyed) continue;
                 scene._componentsManager.callRendererOnUpdate(deltaTime);
                 scene._updateShaderData();
             }
             // Fire script `onBeginRender` and `onEndRender`
-            for(var i1 = 0, n1 = loopScenes.length; i1 < n1; i1++){
-                var scene1 = loopScenes[i1];
-                if (scene1.destroyed) continue;
+            for(var i1 = 0, n1 = scenes.length; i1 < n1; i1++){
+                var scene1 = scenes[i1];
+                if (!scene1.isActive || scene1.destroyed) continue;
                 var cameras = scene1._activeCameras;
                 var cameraCount = cameras.length;
                 if (cameraCount > 0) {
@@ -39659,6 +39657,25 @@
         return AbstractTranscoder;
     }();
     /** @internal */ function TranscodeWorkerCode$1() {
+        var initPromise;
+        var init = 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 initPromise;
+        };
         self.onmessage = function onmessage(event) {
             var message = event.data;
             switch(message.type){
@@ -39858,7 +39875,7 @@
                 } 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 workerCode = "\n        " + jsCode + "\n        " + transcode.toString() + "\n        " + transcodeString + "\n        ";
                     var workerURL = URL.createObjectURL(new Blob([
                         workerCode
                     ], {
@@ -42781,13 +42798,13 @@
             "scene"
         ], true)
     ], SceneLoader);
-    ReflectionParser.registerCustomParseComponent("TextRenderer", /*#__PURE__*/ _async_to_generator(function(instance, item, engine) {
+    ReflectionParser.registerCustomParseComponent("TextRenderer", /*#__PURE__*/ _async_to_generator(function(instance, item) {
         var props;
         return __generator(this, function(_state) {
             props = item.props;
             if (!props.font) {
                 // @ts-ignore
-                instance.font = Font.createFromOS(engine, props.fontFamily || "Arial");
+                instance.font = Font.createFromOS(instance.engine, props.fontFamily || "Arial");
             }
             return [
                 2,
@@ -43277,7 +43294,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.10";
+    var version = "1.1.0-beta.12";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);