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

package/dist/miniprogram.js

@@ -1716,8 +1716,8 @@ var Logger = {
                     } 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);
                     }
                 }
             }
@@ -16324,6 +16324,8 @@ __decorate([
         _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;
@@ -21620,12 +21622,12 @@ var passNum = 0;
     /**
    * @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;
 }();
@@ -24818,6 +24820,7 @@ AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights",
         _this = EngineObject1.call(this, null) || this;
         _this.name = name;
         _this./** @internal */ _curveBindings = [];
+        _this./** @internal */ _updateFlagManager = new UpdateFlagManager();
         _this._length = 0;
         _this._events = [];
         return _this;
@@ -24845,11 +24848,13 @@ AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights",
             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.
@@ -26330,26 +26335,31 @@ exports.AnimatorLayerBlendingMode = void 0;
         }
     };
     _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() {
+            _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++;
@@ -26960,9 +26970,11 @@ __decorate([
         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;
     /**
@@ -27036,6 +27048,11 @@ __decorate([
             index2 !== -1 && this._onStateExitScripts.splice(index2, 1);
         }
     };
+    /**
+   * @internal
+   */ _proto._onClipChanged = function _onClipChanged() {
+        this._updateFlagManager.dispatch();
+    };
     _create_class(AnimatorState, [
         {
             key: "transitions",
@@ -27053,8 +27070,17 @@ __decorate([
                 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);
             }
         },
         {

package/dist/module.js

@@ -1711,8 +1711,8 @@ var Logger = {
                     } 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);
                     }
                 }
             }
@@ -16319,6 +16319,8 @@ __decorate([
         _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;
@@ -21615,12 +21617,12 @@ var passNum = 0;
     /**
    * @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;
 }();
@@ -24813,6 +24815,7 @@ AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights",
         _this = EngineObject1.call(this, null) || this;
         _this.name = name;
         _this./** @internal */ _curveBindings = [];
+        _this./** @internal */ _updateFlagManager = new UpdateFlagManager();
         _this._length = 0;
         _this._events = [];
         return _this;
@@ -24840,11 +24843,13 @@ AnimationCurveOwner.registerAssembler(SkinnedMeshRenderer, "blendShapeWeights",
             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.
@@ -26325,26 +26330,31 @@ var AnimatorLayerBlendingMode;
         }
     };
     _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() {
+            _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++;
@@ -26955,9 +26965,11 @@ __decorate([
         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;
     /**
@@ -27031,6 +27043,11 @@ __decorate([
             index2 !== -1 && this._onStateExitScripts.splice(index2, 1);
         }
     };
+    /**
+   * @internal
+   */ _proto._onClipChanged = function _onClipChanged() {
+        this._updateFlagManager.dispatch();
+    };
     _create_class(AnimatorState, [
         {
             key: "transitions",
@@ -27048,8 +27065,17 @@ __decorate([
                 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);
             }
         },
         {