@galacean/engine 1.1.0-beta.27 → 1.1.0-beta.29

package/dist/browser.js

@@ -6675,8 +6675,8 @@
                         } else {
                             word += char;
                             wordWidth += charInfo.xAdvance;
-                            wordMaxAscent = lineMaxAscent = Math.max(wordMaxAscent, ascent);
-                            wordMaxDescent = lineMaxDescent = Math.max(wordMaxDescent, descent);
+                            wordMaxAscent = Math.max(wordMaxAscent, ascent);
+                            wordMaxDescent = Math.max(wordMaxDescent, descent);
                         }
                     }
                 }
@@ -21067,6 +21067,8 @@
             _this = ReferResource1.call(this, engine) || this;
             /** @internal */ _this._renderStates = [] // todo: later will as a part of shaderData when shader effect frame is OK, that is more powerful and flexible.
             ;
+            /** @internal */ _this._priority = 0 // todo: temporary resolution of submesh rendering order issue.
+            ;
             _this._shaderData = new ShaderData(ShaderDataGroup.Material);
             _this.shader = shader;
             return _this;
@@ -26302,12 +26304,12 @@
         /**
        * @internal
        */ RenderQueue._compareFromNearToFar = function _compareFromNearToFar(a, b) {
-            return a.data.component.priority - b.data.component.priority || a.data.component._distanceForSort - b.data.component._distanceForSort;
+            return a.data.component.priority - b.data.component.priority || a.data.material._priority - b.data.material._priority || a.data.component._distanceForSort - b.data.component._distanceForSort;
         };
         /**
        * @internal
        */ RenderQueue._compareFromFarToNear = function _compareFromFarToNear(a, b) {
-            return a.data.component.priority - b.data.component.priority || b.data.component._distanceForSort - a.data.component._distanceForSort;
+            return a.data.component.priority - b.data.component.priority || a.data.material._priority - b.data.material._priority || b.data.component._distanceForSort - a.data.component._distanceForSort;
         };
         return RenderQueue;
     }();
@@ -29466,6 +29468,7 @@
             _this = EngineObject1.call(this, null) || this;
             _this.name = name1;
             _this./** @internal */ _curveBindings = [];
+            _this./** @internal */ _updateFlagManager = new UpdateFlagManager();
             _this._length = 0;
             _this._events = [];
             return _this;
@@ -29494,11 +29497,13 @@
                 while(--index >= 0 && eventTime < events[index].time);
                 events.splice(index + 1, 0, newEvent);
             }
+            this._updateFlagManager.dispatch();
         };
         /**
        * Clears all events from the clip.
        */ _proto.clearEvents = function clearEvents() {
             this._events.length = 0;
+            this._updateFlagManager.dispatch();
         };
         /**
        * Add curve binding for the clip.
@@ -30955,26 +30960,31 @@
             }
         };
         _proto._saveAnimatorEventHandlers = function _saveAnimatorEventHandlers(state, animatorStateData) {
+            var _this = this;
             var eventHandlerPool = this._animationEventHandlerPool;
             var scripts = [];
-            this._entity.getComponents(Script, scripts);
-            var scriptCount = scripts.length;
             var eventHandlers = animatorStateData.eventHandlers;
-            var events = state.clip.events;
-            eventHandlers.length = 0;
-            for(var i = 0, n = events.length; i < n; i++){
-                var event = events[i];
-                var eventHandler = eventHandlerPool.getFromPool();
-                var funcName = event.functionName;
-                var handlers = eventHandler.handlers;
-                eventHandler.event = event;
-                handlers.length = 0;
-                for(var j = scriptCount - 1; j >= 0; j--){
-                    var handler = scripts[j][funcName];
-                    handler && handlers.push(handler);
+            var clipChangedListener = function clipChangedListener() {
+                _this._entity.getComponents(Script, scripts);
+                var scriptCount = scripts.length;
+                var events = state.clip.events;
+                eventHandlers.length = 0;
+                for(var i = 0, n = events.length; i < n; i++){
+                    var event = events[i];
+                    var eventHandler = eventHandlerPool.getFromPool();
+                    var funcName = event.functionName;
+                    var handlers = eventHandler.handlers;
+                    eventHandler.event = event;
+                    handlers.length = 0;
+                    for(var j = scriptCount - 1; j >= 0; j--){
+                        var handler = scripts[j][funcName];
+                        handler && handlers.push(handler);
+                    }
+                    eventHandlers.push(eventHandler);
                 }
-                eventHandlers.push(eventHandler);
-            }
+            };
+            clipChangedListener();
+            state._updateFlagManager.addListener(clipChangedListener);
         };
         _proto._clearCrossData = function _clearCrossData(animatorLayerData) {
             animatorLayerData.crossCurveMark++;
@@ -31581,9 +31591,11 @@
             this./** @internal */ _onStateEnterScripts = [];
             this./** @internal */ _onStateUpdateScripts = [];
             this./** @internal */ _onStateExitScripts = [];
+            this./** @internal */ _updateFlagManager = new UpdateFlagManager();
             this._clipStartTime = 0;
             this._clipEndTime = 1;
             this._transitions = [];
+            this._onClipChanged = this._onClipChanged.bind(this);
         };
         var _proto = AnimatorState.prototype;
         /**
@@ -31657,6 +31669,11 @@
                 index2 !== -1 && this._onStateExitScripts.splice(index2, 1);
             }
         };
+        /**
+       * @internal
+       */ _proto._onClipChanged = function _onClipChanged() {
+            this._updateFlagManager.dispatch();
+        };
         _create_class$3(AnimatorState, [
             {
                 key: "transitions",
@@ -31674,8 +31691,17 @@
                     return this._clip;
                 },
                 set: function set(clip) {
+                    var lastClip = this._clip;
+                    if (lastClip === clip) {
+                        return;
+                    }
+                    if (lastClip) {
+                        lastClip._updateFlagManager.removeListener(this._onClipChanged);
+                    }
                     this._clip = clip;
                     this._clipEndTime = Math.min(this._clipEndTime, 1);
+                    this._onClipChanged();
+                    clip._updateFlagManager.addListener(this._onClipChanged);
                 }
             },
             {
@@ -38057,6 +38083,8 @@
                 if (position) entity.transform.position.copyFrom(position);
                 if (rotation) entity.transform.rotation.copyFrom(rotation);
                 if (scale) entity.transform.scale.copyFrom(scale);
+                var _entityConfig_layer;
+                entity.layer = (_entityConfig_layer = entityConfig.layer) != null ? _entityConfig_layer : entity.layer;
                 return entity;
             });
         };
@@ -43105,6 +43133,9 @@
                             if (shadow.shadowResolution != undefined) scene.shadowResolution = shadow.shadowResolution;
                             if (shadow.shadowDistance != undefined) scene.shadowDistance = shadow.shadowDistance;
                             if (shadow.shadowCascades != undefined) scene.shadowCascades = shadow.shadowCascades;
+                            var _shadow_shadowTwoCascadeSplits;
+                            scene.shadowTwoCascadeSplits = (_shadow_shadowTwoCascadeSplits = shadow.shadowTwoCascadeSplits) != null ? _shadow_shadowTwoCascadeSplits : scene.shadowTwoCascadeSplits;
+                            shadow.shadowFourCascadeSplits && scene.shadowFourCascadeSplits.copyFrom(shadow.shadowFourCascadeSplits);
                         }
                         return Promise.all(promises).then(function() {
                             resolve(scene);
@@ -43616,7 +43647,7 @@
     ], GALACEAN_animation_event);
 
     //@ts-ignore
-    var version = "1.1.0-beta.27";
+    var version = "1.1.0-beta.29";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);