@galacean/engine-core 1.1.0-beta.15 → 1.1.0-beta.16

package/dist/main.js

@@ -24492,9 +24492,7 @@ var DirtyFlag;
         this.property = property;
         this.component = target.getComponent(type);
         this.cureType = cureType;
-        var isBlendShape = _instanceof(this.component, SkinnedMeshRenderer);
-        // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
-        this._isCopyMode = cureType._isCopyMode && !isBlendShape;
+        this._isBlendShape = _instanceof(this.component, SkinnedMeshRenderer);
         var assemblerType = AnimationCurveOwner.getAssemblerType(type, property);
         this._assembler = new assemblerType();
         this._assembler.initialize(this);
@@ -24526,7 +24524,7 @@ var DirtyFlag;
         this._assembler.setTargetValue(this.defaultValue);
     };
     _proto.getEvaluateValue = function getEvaluateValue(out) {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             this.cureType._setValue(this.baseEvaluateData.value, out);
             return out;
         } else {
@@ -24534,14 +24532,14 @@ var DirtyFlag;
         }
     };
     _proto.saveDefaultValue = function saveDefaultValue() {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             this.cureType._setValue(this.referenceTargetValue, this.defaultValue);
         } else {
             this.defaultValue = this._assembler.getTargetValue();
         }
     };
     _proto.saveFixedPoseValue = function saveFixedPoseValue() {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             this.cureType._setValue(this.referenceTargetValue, this.fixedPoseValue);
         } else {
             this.fixedPoseValue = this._assembler.getTargetValue();
@@ -24550,40 +24548,50 @@ var DirtyFlag;
     _proto.applyValue = function applyValue(value, weight, additive) {
         var cureType = this.cureType;
         if (additive) {
-            if (this._isCopyMode) {
-                cureType._additiveValue(value, weight, this.referenceTargetValue);
+            var assembler = this._assembler;
+            if (cureType._isCopyMode) {
+                var additiveValue = cureType._additiveValue(value, weight, this.referenceTargetValue);
+                // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
+                if (this._isBlendShape) {
+                    assembler.setTargetValue(additiveValue);
+                }
             } else {
-                var assembler = this._assembler;
                 var originValue = assembler.getTargetValue();
-                var additiveValue = cureType._additiveValue(value, weight, originValue);
-                assembler.setTargetValue(additiveValue);
+                var additiveValue1 = cureType._additiveValue(value, weight, originValue);
+                assembler.setTargetValue(additiveValue1);
             }
         } else {
             if (weight === 1.0) {
-                if (this._isCopyMode) {
+                if (cureType._isCopyMode) {
                     cureType._setValue(value, this.referenceTargetValue);
+                    // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
+                    if (this._isBlendShape) {
+                        this._assembler.setTargetValue(this.referenceTargetValue);
+                    }
                 } else {
                     this._assembler.setTargetValue(value);
                 }
             } else {
-                if (this._isCopyMode) {
+                if (cureType._isCopyMode) {
                     var targetValue = this.referenceTargetValue;
                     cureType._lerpValue(targetValue, value, weight, targetValue);
+                    // @todo: Temp solution with blendShape bug when multi SkinnedMeshRenderer in a entity. we need to run setTargetValue to solve it.
+                    if (this._isBlendShape) {
+                        this._assembler.setTargetValue(targetValue);
+                    }
                 } else {
                     var originValue1 = this._assembler.getTargetValue();
-                    // @todo: Temp solution in PR: https://github.com/galacean/engine/pull/1840
-                    var lerpValue = cureType._lerpValue(originValue1, value, weight, originValue1);
+                    var lerpValue = cureType._lerpValue(originValue1, value, weight);
                     this._assembler.setTargetValue(lerpValue);
                 }
             }
         }
     };
     _proto._lerpValue = function _lerpValue(srcValue, destValue, crossWeight) {
-        if (this._isCopyMode) {
+        if (this.cureType._isCopyMode) {
             return this.cureType._lerpValue(srcValue, destValue, crossWeight, this.baseEvaluateData.value);
         } else {
-            // @todo: Temp solution in PR: https://github.com/galacean/engine/pull/1840
-            this.baseEvaluateData.value = this.cureType._lerpValue(srcValue, destValue, crossWeight, this.baseEvaluateData.value);
+            this.baseEvaluateData.value = this.cureType._lerpValue(srcValue, destValue, crossWeight);
             return this.baseEvaluateData.value;
         }
     };