@galacean/engine 1.3.14 → 1.3.15

package/dist/browser.js

@@ -30896,16 +30896,17 @@
        * @internal
        */ _proto._onDisableInScene = function _onDisableInScene() {
             var componentsManager = this.scene._componentsManager;
+            var prototype = Script.prototype;
             if (!this._started) {
                 componentsManager.removeOnStartScript(this);
             }
-            if (this._onUpdateIndex >= 0) {
+            if (this.onUpdate !== prototype.onUpdate) {
                 componentsManager.removeOnUpdateScript(this);
             }
-            if (this._onLateUpdateIndex >= 0) {
+            if (this.onLateUpdate !== prototype.onLateUpdate) {
                 componentsManager.removeOnLateUpdateScript(this);
             }
-            if (this._onPhysicsUpdateIndex >= 0) {
+            if (this.onPhysicsUpdate !== prototype.onPhysicsUpdate) {
                 componentsManager.removeOnPhysicsUpdateScript(this);
             }
             this._entity._removeScript(this);
@@ -32875,7 +32876,8 @@
         var _proto = AnimatorStatePlayData.prototype;
         _proto.reset = function reset(state, stateData, offsetFrameTime) {
             this.state = state;
-            this.frameTime = offsetFrameTime;
+            this.playedTime = 0;
+            this.offsetFrameTime = offsetFrameTime;
             this.stateData = stateData;
             this.playState = AnimatorStatePlayState.UnStarted;
             this.clipTime = state.clipStartTime * state.clip.length;
@@ -32894,9 +32896,9 @@
             }
         };
         _proto.update = function update(deltaTime) {
-            this.frameTime += deltaTime;
+            this.playedTime += deltaTime;
             var state = this.state;
-            var time = this.frameTime;
+            var time = this.playedTime + this.offsetFrameTime;
             var duration = state._getDuration();
             this.playState = AnimatorStatePlayState.Playing;
             if (state.wrapMode === exports.WrapMode.Loop) {
@@ -33340,9 +33342,8 @@
             var transition = anyStateTransitions.length && this._applyTransitionsByCondition(layerIndex, layerData, layer, state, anyStateTransitions, aniUpdate) || transitions.length && this._applyStateTransitions(layerIndex, layerData, layer, isForwards, srcPlayData, transitions, lastClipTime, clipTime, playDeltaTime, aniUpdate);
             var playCostTime;
             if (transition) {
-                var clipDuration = state.clip.length;
-                var clipEndTime = state.clipEndTime * clipDuration;
-                var exitTime = transition.exitTime * state._getDuration();
+                var clipEndTime = state._getClipActualEndTime();
+                var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
                 if (isForwards) {
                     if (exitTime < lastClipTime) {
                         playCostTime = exitTime + clipEndTime - lastClipTime;
@@ -33350,7 +33351,7 @@
                         playCostTime = exitTime - lastClipTime;
                     }
                 } else {
-                    var startTime = state.clipStartTime * clipDuration;
+                    var startTime = state._getClipActualStartTime();
                     if (lastClipTime < exitTime) {
                         playCostTime = clipEndTime - exitTime + lastClipTime - startTime;
                     } else {
@@ -33412,18 +33413,20 @@
             var lastDestClipTime = destPlayData.clipTime, lastDstPlayState = destPlayData.playState;
             var dstPlayCostTime;
             if (destPlayData.isForwards) {
-                dstPlayCostTime = lastDestClipTime + dstPlayDeltaTime > transitionDuration ? transitionDuration - lastDestClipTime : dstPlayDeltaTime;
+                // The time that has been played
+                var playedTime = destPlayData.playedTime;
+                dstPlayCostTime = playedTime + dstPlayDeltaTime > transitionDuration ? transitionDuration - playedTime : dstPlayDeltaTime;
             } else {
                 // The time that has been played
-                var playedTime = destStateDuration - lastDestClipTime;
+                var playedTime1 = destPlayData.playedTime;
                 dstPlayCostTime = // > transition: The time that will be played is enough to finish the transition
-                playedTime - dstPlayDeltaTime > transitionDuration ? playedTime - transitionDuration : dstPlayDeltaTime;
+                playedTime1 - dstPlayDeltaTime > transitionDuration ? playedTime1 - transitionDuration : dstPlayDeltaTime;
             }
             var actualCostTime = dstPlaySpeed === 0 ? deltaTime : dstPlayCostTime / dstPlaySpeed;
             var srcPlayCostTime = actualCostTime * srcPlaySpeed;
             srcPlayData.update(srcPlayCostTime);
             destPlayData.update(dstPlayCostTime);
-            var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
+            var crossWeight = Math.abs(destPlayData.playedTime) / transitionDuration;
             (crossWeight >= 1.0 - MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
             var crossFadeFinished = crossWeight === 1.0;
             if (crossFadeFinished) {
@@ -33473,16 +33476,18 @@
             var lastDestClipTime = destPlayData.clipTime, lastPlayState = destPlayData.playState;
             var dstPlayCostTime;
             if (destPlayData.isForwards) {
-                dstPlayCostTime = lastDestClipTime + playDeltaTime > transitionDuration ? transitionDuration - lastDestClipTime : playDeltaTime;
+                // The time that has been played
+                var playedTime = destPlayData.playedTime;
+                dstPlayCostTime = playedTime + playDeltaTime > transitionDuration ? transitionDuration - playedTime : playDeltaTime;
             } else {
                 // The time that has been played
-                var playedTime = stateDuration - lastDestClipTime;
+                var playedTime1 = destPlayData.playedTime;
                 dstPlayCostTime = // > transition: The time that will be played is enough to finish the transition
-                playedTime - playDeltaTime > transitionDuration ? playedTime - transitionDuration : playDeltaTime;
+                playedTime1 - playDeltaTime > transitionDuration ? playedTime1 - transitionDuration : playDeltaTime;
             }
             var actualCostTime = playSpeed === 0 ? deltaTime : dstPlayCostTime / playSpeed;
             destPlayData.update(dstPlayCostTime);
-            var crossWeight = Math.abs(destPlayData.frameTime) / transitionDuration;
+            var crossWeight = Math.abs(destPlayData.playedTime) / transitionDuration;
             (crossWeight >= 1.0 - MathUtil.zeroTolerance || transitionDuration === 0) && (crossWeight = 1.0);
             var crossFadeFinished = crossWeight === 1.0;
             if (crossFadeFinished) {
@@ -33610,10 +33615,9 @@
         _proto._checkSubTransition = function _checkSubTransition(layerIndex, layerData, layer, playState, transitions, lastClipTime, curClipTime, aniUpdate) {
             var state = playState.state;
             var transitionIndex = playState.currentTransitionIndex;
-            var duration = state._getDuration();
             for(var n = transitions.length; transitionIndex < n; transitionIndex++){
                 var transition = transitions[transitionIndex];
-                var exitTime = transition.exitTime * duration;
+                var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
                 if (exitTime > curClipTime) {
                     break;
                 }
@@ -33633,10 +33637,9 @@
         _proto._checkBackwardsSubTransition = function _checkBackwardsSubTransition(layerIndex, layerData, layer, playState, transitions, lastClipTime, curClipTime, aniUpdate) {
             var state = playState.state;
             var transitionIndex = playState.currentTransitionIndex;
-            var duration = playState.state._getDuration();
             for(; transitionIndex >= 0; transitionIndex--){
                 var transition = transitions[transitionIndex];
-                var exitTime = transition.exitTime * duration;
+                var exitTime = transition.exitTime * state._getDuration() + state._getClipActualStartTime();
                 if (exitTime < curClipTime) {
                     break;
                 }
@@ -34259,6 +34262,16 @@
                 }
             }
         };
+        /**
+       * @internal
+       */ _proto._getClipActualStartTime = function _getClipActualStartTime() {
+            return this._clipStartTime * this.clip.length;
+        };
+        /**
+       * @internal
+       */ _proto._getClipActualEndTime = function _getClipActualEndTime() {
+            return this._clipEndTime * this.clip.length;
+        };
         _create_class$2(AnimatorState, [
             {
                 key: "transitions",
@@ -48150,7 +48163,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.3.14";
+    var version = "1.3.15";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);