@galacean/engine-physics-physx 0.9.17 → 0.9.19

package/dist/miniprogram.js

@@ -21261,6 +21261,7 @@ var DirtyFlag;
             curKeyframeIndex: 0,
             value: null
         };
+        this.updateMark = 0;
         this.target = target;
         this.type = type;
         this.property = property;
@@ -22701,9 +22702,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,
@@ -22732,7 +22733,7 @@ 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(playLayerIndex);
@@ -22788,7 +22789,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) {
@@ -22838,7 +22839,6 @@ exports.AnimatorLayerBlendingMode = void 0;
             }
         }
         this._animatorLayersData.length = 0;
-        this._needRevertCurveOwners.length = 0;
         this._curveOwnerPool = {};
         this._animationEventHandlerPool.resetPool();
         if (this._controllerUpdateFlag) {
@@ -22889,27 +22889,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;
-                if (this.animatorController.layers[layerIndex].blendingMode === exports.AnimatorLayerBlendingMode.Additive && layerIndex > 0) {
-                    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 + ".");
             }
         }
     };
@@ -23035,6 +23024,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();
@@ -23080,6 +23070,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();
@@ -23126,6 +23117,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();
@@ -23152,6 +23144,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);
         }
     };
@@ -23207,7 +23200,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);
@@ -23219,12 +23212,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);
@@ -23321,11 +23314,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$2(Animator, [
         {
@@ -23355,13 +23348,13 @@ __decorate$1([
 ], Animator.prototype, "_controllerUpdateFlag", void 0);
 __decorate$1([
     ignoreClone
-], Animator.prototype, "_animatorLayersData", void 0);
+], Animator.prototype, "_updateMark", void 0);
 __decorate$1([
     ignoreClone
-], Animator.prototype, "_curveOwnerPool", void 0);
+], Animator.prototype, "_animatorLayersData", void 0);
 __decorate$1([
     ignoreClone
-], Animator.prototype, "_needRevertCurveOwners", void 0);
+], Animator.prototype, "_curveOwnerPool", void 0);
 __decorate$1([
     ignoreClone
 ], Animator.prototype, "_animationEventHandlerPool", void 0);
@@ -36256,7 +36249,7 @@ function _interopNamespace(e) {
 }
 var CoreObjects__namespace = /*#__PURE__*/ _interopNamespace(CoreObjects);
 //@ts-ignore
-var version = "0.9.17";
+var version = "0.9.19";
 console.log("Galacean engine version: " + version);
 for(var key in CoreObjects__namespace){
     CoreObjects.Loader.registerClass(key, CoreObjects__namespace[key]);