@galacean/engine-core 1.0.0-beta.13 → 1.0.0-beta.14

package/dist/main.js

@@ -22682,6 +22682,7 @@ var DirtyFlag;
             curKeyframeIndex: 0,
             value: null
         };
+        this.updateMark = 0;
         this.target = target;
         this.type = type;
         this.property = property;
@@ -24155,9 +24156,9 @@ exports.AnimatorLayerBlendingMode = void 0;
         _this = Component.call(this, entity) || this;
         /** Culling mode of this Animator. */ _this.cullingMode = exports.AnimatorCullingMode.None;
         /** The playback speed of the Animator, 1.0 is normal playback speed. */ _this.speed = 1.0;
+        _this._updateMark = 0;
         _this._animatorLayersData = [];
         _this._curveOwnerPool = Object.create(null);
-        _this._needRevertCurveOwners = [];
         _this._animationEventHandlerPool = new ClassPool(AnimationEventHandler);
         _this._tempAnimatorStateInfo = {
             layerIndex: -1,
@@ -24185,10 +24186,10 @@ exports.AnimatorLayerBlendingMode = void 0;
             return;
         }
         if (!state.clip) {
-            console.warn("The state named " + stateName + " has no AnimationClip data.");
+            Logger.warn("The state named " + stateName + " has no AnimationClip data.");
             return;
         }
-        var animatorLayerData = this._getAnimatorLayerData(stateInfo.layerIndex);
+        var animatorLayerData = this._getAnimatorLayerData(playLayerIndex);
         var animatorStateData = this._getAnimatorStateData(stateName, state, animatorLayerData, playLayerIndex);
         this._preparePlay(animatorLayerData, state);
         animatorLayerData.layerState = LayerState.Playing;
@@ -24207,8 +24208,8 @@ exports.AnimatorLayerBlendingMode = void 0;
         if ((_this__controllerUpdateFlag = this._controllerUpdateFlag) == null ? void 0 : _this__controllerUpdateFlag.flag) {
             this._reset();
         }
-        var state = this._getAnimatorStateInfo(stateName, layerIndex).state;
-        var manuallyTransition = this._getAnimatorLayerData(layerIndex).manuallyTransition;
+        var _this__getAnimatorStateInfo = this._getAnimatorStateInfo(stateName, layerIndex), state = _this__getAnimatorStateInfo.state, playLayerIndex = _this__getAnimatorStateInfo.layerIndex;
+        var manuallyTransition = this._getAnimatorLayerData(playLayerIndex).manuallyTransition;
         manuallyTransition.duration = normalizedTransitionDuration;
         manuallyTransition.offset = normalizedTimeOffset;
         manuallyTransition.destinationState = state;
@@ -24241,7 +24242,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             return;
         }
         deltaTime *= this.speed;
-        this._revertCurveOwners();
+        this._updateMark++;
         for(var i1 = 0, n1 = animatorController.layers.length; i1 < n1; i1++){
             var animatorLayerData = this._getAnimatorLayerData(i1);
             if (animatorLayerData.layerState === LayerState.Standby) {
@@ -24289,7 +24290,6 @@ exports.AnimatorLayerBlendingMode = void 0;
             }
         }
         this._animatorLayersData.length = 0;
-        this._needRevertCurveOwners.length = 0;
         this._curveOwnerPool = {};
         this._animationEventHandlerPool.resetPool();
         if (this._controllerUpdateFlag) {
@@ -24331,8 +24331,8 @@ exports.AnimatorLayerBlendingMode = void 0;
     _proto._saveAnimatorStateData = function _saveAnimatorStateData(animatorState, animatorStateData, animatorLayerData, layerIndex) {
         var _this = this, entity = _this.entity, curveOwnerPool = _this._curveOwnerPool;
         var curveLayerOwner = animatorStateData.curveLayerOwner;
-        var layerCurveOwnerPool = animatorLayerData.curveOwnerPool;
         var _animatorState_clip = animatorState.clip, curves = _animatorState_clip._curveBindings;
+        var layerCurveOwnerPool = animatorLayerData.curveOwnerPool;
         for(var i = curves.length - 1; i >= 0; i--){
             var curve = curves[i];
             var targetEntity = curve.relativePath === "" ? entity : entity.findByPath(curve.relativePath);
@@ -24340,29 +24340,16 @@ exports.AnimatorLayerBlendingMode = void 0;
                 var _curveOwnerPool, _instanceId, _propertyOwners, _property, _layerCurveOwnerPool, _instanceId1, _layerPropertyOwners, _property1;
                 var property = curve.property;
                 var instanceId = targetEntity.instanceId;
-                var needRevert = false;
-                var baseAnimatorLayerData = this._animatorLayersData[0];
-                var baseLayerCurveOwnerPool = baseAnimatorLayerData.curveOwnerPool;
-                if (this.animatorController.layers[layerIndex].blendingMode === exports.AnimatorLayerBlendingMode.Additive && layerIndex > 0 && !(baseLayerCurveOwnerPool[instanceId] && baseLayerCurveOwnerPool[instanceId][property])) {
-                    needRevert = true;
-                }
                 // Get owner
                 var propertyOwners = (_curveOwnerPool = curveOwnerPool)[_instanceId = instanceId] || (_curveOwnerPool[_instanceId] = Object.create(null));
                 var owner = (_propertyOwners = propertyOwners)[_property = property] || (_propertyOwners[_property] = curve._createCurveOwner(targetEntity));
-                //@todo: There is performance waste here, which will be handled together with organizing AnimatorStateData later. The logic is changing from runtime to initialization.
-                if (needRevert) {
-                    this._needRevertCurveOwners.push(owner);
-                } else {
-                    var index = this._needRevertCurveOwners.indexOf(owner);
-                    index > -1 && this._needRevertCurveOwners.splice(index, 1);
-                }
                 // Get layer owner
                 var layerPropertyOwners = (_layerCurveOwnerPool = layerCurveOwnerPool)[_instanceId1 = instanceId] || (_layerCurveOwnerPool[_instanceId1] = Object.create(null));
                 var layerOwner = (_layerPropertyOwners = layerPropertyOwners)[_property1 = property] || (_layerPropertyOwners[_property1] = curve._createCurveLayerOwner(owner));
                 curveLayerOwner[i] = layerOwner;
             } else {
                 curveLayerOwner[i] = null;
-                console.warn("The entity don't have the child entity which path is " + curve.relativePath + ".");
+                Logger.warn("The entity don't have the child entity which path is " + curve.relativePath + ".");
             }
         }
     };
@@ -24488,6 +24475,7 @@ exports.AnimatorLayerBlendingMode = void 0;
                 if (!owner) continue;
                 var curve = curveBindings[i].curve;
                 if (curve.keys.length) {
+                    this._checkRevertOwner(owner, additive);
                     var value = owner.evaluateValue(curve, clipTime, additive);
                     aniUpdate && owner.applyValue(value, weight, additive);
                     finished && layerOwner.saveFinalValue();
@@ -24533,6 +24521,7 @@ exports.AnimatorLayerBlendingMode = void 0;
                 if (!owner) continue;
                 var srcCurveIndex = layerOwner.crossSrcCurveIndex;
                 var destCurveIndex = layerOwner.crossDestCurveIndex;
+                this._checkRevertOwner(owner, additive);
                 var value = owner.evaluateCrossFadeValue(srcCurveIndex >= 0 ? srcCurves[srcCurveIndex].curve : null, destCurveIndex >= 0 ? destCurves[destCurveIndex].curve : null, srcClipTime, destClipTime, crossWeight, additive);
                 aniUpdate && owner.applyValue(value, weight, additive);
                 finished && layerOwner.saveFinalValue();
@@ -24579,6 +24568,7 @@ exports.AnimatorLayerBlendingMode = void 0;
                 var owner = layerOwner == null ? void 0 : layerOwner.curveOwner;
                 if (!owner) continue;
                 var curveIndex = layerOwner.crossDestCurveIndex;
+                this._checkRevertOwner(owner, additive);
                 var value = layerOwner.curveOwner.crossFadeFromPoseAndApplyValue(curveIndex >= 0 ? curveBindings[curveIndex].curve : null, destClipTime, crossWeight, additive);
                 aniUpdate && owner.applyValue(value, weight, additive);
                 finished && layerOwner.saveFinalValue();
@@ -24605,6 +24595,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             var layerOwner = curveLayerOwner[i];
             var owner = layerOwner == null ? void 0 : layerOwner.curveOwner;
             if (!owner) continue;
+            this._checkRevertOwner(owner, additive);
             owner.applyValue(layerOwner.finalValue, weight, additive);
         }
     };
@@ -24630,16 +24621,14 @@ exports.AnimatorLayerBlendingMode = void 0;
                 var curveLayerOwner = srcPlayData.stateData.curveLayerOwner;
                 for(var i = curveLayerOwner.length - 1; i >= 0; i--){
                     var _curveLayerOwner_i;
-                    var owner = (_curveLayerOwner_i = curveLayerOwner[i]) == null ? void 0 : _curveLayerOwner_i.curveOwner;
-                    owner.revertDefaultValue();
+                    (_curveLayerOwner_i = curveLayerOwner[i]) == null ? void 0 : _curveLayerOwner_i.curveOwner.revertDefaultValue();
                 }
             }
         } else {
             // layerState is CrossFading, FixedCrossFading, Standby, Finished
             var crossLayerOwnerCollection = layerData.crossLayerOwnerCollection;
             for(var i1 = crossLayerOwnerCollection.length - 1; i1 >= 0; i1--){
-                var owner1 = crossLayerOwnerCollection[i1].curveOwner;
-                owner1.revertDefaultValue();
+                crossLayerOwnerCollection[i1].curveOwner.revertDefaultValue();
             }
         }
     };
@@ -24662,7 +24651,7 @@ exports.AnimatorLayerBlendingMode = void 0;
             return;
         }
         if (!crossState.clip) {
-            console.warn("The state named " + name + " has no AnimationClip data.");
+            Logger.warn("The state named " + name + " has no AnimationClip data.");
             return;
         }
         var animatorLayerData = this._getAnimatorLayerData(playLayerIndex);
@@ -24674,12 +24663,12 @@ exports.AnimatorLayerBlendingMode = void 0;
         destPlayData.reset(crossState, animatorStateData, offset);
         switch(layerState){
             case LayerState.Standby:
+            case LayerState.Finished:
                 animatorLayerData.layerState = LayerState.FixedCrossFading;
                 this._clearCrossData(animatorLayerData);
                 this._prepareStandbyCrossFading(animatorLayerData);
                 break;
             case LayerState.Playing:
-            case LayerState.Finished:
                 animatorLayerData.layerState = LayerState.CrossFading;
                 this._clearCrossData(animatorLayerData);
                 this._prepareCrossFading(animatorLayerData);
@@ -24776,11 +24765,11 @@ exports.AnimatorLayerBlendingMode = void 0;
             }
         }
     };
-    _proto._revertCurveOwners = function _revertCurveOwners() {
-        var curveOwners = this._needRevertCurveOwners;
-        for(var i = 0, n = curveOwners.length; i < n; ++i){
-            curveOwners[i].revertDefaultValue();
+    _proto._checkRevertOwner = function _checkRevertOwner(owner, additive) {
+        if (additive && owner.updateMark !== this._updateMark) {
+            owner.revertDefaultValue();
         }
+        owner.updateMark = this._updateMark;
     };
     _create_class(Animator, [
         {
@@ -24810,13 +24799,13 @@ __decorate([
 ], Animator.prototype, "_controllerUpdateFlag", void 0);
 __decorate([
     ignoreClone
-], Animator.prototype, "_animatorLayersData", void 0);
+], Animator.prototype, "_updateMark", void 0);
 __decorate([
     ignoreClone
-], Animator.prototype, "_curveOwnerPool", void 0);
+], Animator.prototype, "_animatorLayersData", void 0);
 __decorate([
     ignoreClone
-], Animator.prototype, "_needRevertCurveOwners", void 0);
+], Animator.prototype, "_curveOwnerPool", void 0);
 __decorate([
     ignoreClone
 ], Animator.prototype, "_animationEventHandlerPool", void 0);