@galacean/engine-core 0.9.18 → 0.9.20

package/dist/miniprogram.js

@@ -18397,18 +18397,10 @@ var defaultInterval = 500;
         var _config_type;
         config.type = (_config_type = config.type) != null ? _config_type : getMimeTypeFromUrl(url);
         var realRequest = config.type === "image" ? requestImage : requestRes;
-        var lastError;
         var executor = new MultiExecutor(function() {
-            return realRequest(url, config).onProgress(setProgress).then(function(res) {
-                resolve(res);
-                executor.stop();
-            }).catch(function(err) {
-                return lastError = err;
-            });
+            return realRequest(url, config).onProgress(setProgress);
         }, retryCount, retryInterval);
-        executor.start(function() {
-            reject(lastError);
-        });
+        executor.start().onError(reject).onComplete(resolve);
     });
 }
 function requestImage(url, config) {
@@ -18495,23 +18487,33 @@ var MultiExecutor = /*#__PURE__*/ function() {
         this.exec = this.exec.bind(this);
     }
     var _proto = MultiExecutor.prototype;
-    _proto.start = function start(done) {
-        this.done = done;
+    _proto.start = function start() {
         this.exec();
+        return this;
     };
-    _proto.stop = function stop() {
-        clearTimeout(this._timeoutId);
+    _proto.onComplete = function onComplete(func) {
+        this._onComplete = func;
+        return this;
+    };
+    _proto.onError = function onError(func) {
+        this._onError = func;
+        return this;
+    };
+    _proto.cancel = function cancel() {
+        engineMiniprogramAdapter.window.clearTimeout(this._timeoutId);
     };
     _proto.exec = function exec() {
         var _this = this;
         if (this._currentCount >= this.totalCount) {
-            this.done && this.done();
+            this._onError && this._onError(this._error);
             return;
         }
         this._currentCount++;
-        this.execFunc(this._currentCount).then(function() {
-            //@ts-ignore
-            _this._timeoutId = setTimeout(_this.exec, _this.interval);
+        this.execFunc(this._currentCount).then(function(result) {
+            return _this._onComplete && _this._onComplete(result);
+        }).catch(function(e) {
+            _this._error = e;
+            _this._timeoutId = engineMiniprogramAdapter.window.setTimeout(_this.exec, _this.interval);
         });
     };
     return MultiExecutor;
@@ -21478,6 +21480,7 @@ var DirtyFlag;
             curKeyframeIndex: 0,
             value: null
         };
+        this.updateMark = 0;
         this.target = target;
         this.type = type;
         this.property = property;
@@ -22950,9 +22953,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,
@@ -23036,7 +23039,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) {
@@ -23086,7 +23089,6 @@ exports.AnimatorLayerBlendingMode = void 0;
             }
         }
         this._animatorLayersData.length = 0;
-        this._needRevertCurveOwners.length = 0;
         this._curveOwnerPool = {};
         this._animationEventHandlerPool.resetPool();
         if (this._controllerUpdateFlag) {
@@ -23137,17 +23139,9 @@ 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);
-                }
                 // 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));
@@ -23280,6 +23274,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();
@@ -23325,6 +23320,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();
@@ -23371,6 +23367,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();
@@ -23397,6 +23394,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);
         }
     };
@@ -23566,11 +23564,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, [
         {
@@ -23600,13 +23598,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);

package/dist/module.js

@@ -18392,18 +18392,10 @@ var defaultInterval = 500;
         var _config_type;
         config.type = (_config_type = config.type) != null ? _config_type : getMimeTypeFromUrl(url);
         var realRequest = config.type === "image" ? requestImage : requestRes;
-        var lastError;
         var executor = new MultiExecutor(function() {
-            return realRequest(url, config).onProgress(setProgress).then(function(res) {
-                resolve(res);
-                executor.stop();
-            }).catch(function(err) {
-                return lastError = err;
-            });
+            return realRequest(url, config).onProgress(setProgress);
         }, retryCount, retryInterval);
-        executor.start(function() {
-            reject(lastError);
-        });
+        executor.start().onError(reject).onComplete(resolve);
     });
 }
 function requestImage(url, config) {
@@ -18490,23 +18482,33 @@ var MultiExecutor = /*#__PURE__*/ function() {
         this.exec = this.exec.bind(this);
     }
     var _proto = MultiExecutor.prototype;
-    _proto.start = function start(done) {
-        this.done = done;
+    _proto.start = function start() {
         this.exec();
+        return this;
     };
-    _proto.stop = function stop() {
-        clearTimeout(this._timeoutId);
+    _proto.onComplete = function onComplete(func) {
+        this._onComplete = func;
+        return this;
+    };
+    _proto.onError = function onError(func) {
+        this._onError = func;
+        return this;
+    };
+    _proto.cancel = function cancel() {
+        window.clearTimeout(this._timeoutId);
     };
     _proto.exec = function exec() {
         var _this = this;
         if (this._currentCount >= this.totalCount) {
-            this.done && this.done();
+            this._onError && this._onError(this._error);
             return;
         }
         this._currentCount++;
-        this.execFunc(this._currentCount).then(function() {
-            //@ts-ignore
-            _this._timeoutId = setTimeout(_this.exec, _this.interval);
+        this.execFunc(this._currentCount).then(function(result) {
+            return _this._onComplete && _this._onComplete(result);
+        }).catch(function(e) {
+            _this._error = e;
+            _this._timeoutId = window.setTimeout(_this.exec, _this.interval);
         });
     };
     return MultiExecutor;
@@ -21473,6 +21475,7 @@ var DirtyFlag;
             curKeyframeIndex: 0,
             value: null
         };
+        this.updateMark = 0;
         this.target = target;
         this.type = type;
         this.property = property;
@@ -22945,9 +22948,9 @@ var AnimatorLayerBlendingMode;
         _this = Component.call(this, entity) || this;
         /** Culling mode of this Animator. */ _this.cullingMode = 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,
@@ -23031,7 +23034,7 @@ var AnimatorLayerBlendingMode;
             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) {
@@ -23081,7 +23084,6 @@ var AnimatorLayerBlendingMode;
             }
         }
         this._animatorLayersData.length = 0;
-        this._needRevertCurveOwners.length = 0;
         this._curveOwnerPool = {};
         this._animationEventHandlerPool.resetPool();
         if (this._controllerUpdateFlag) {
@@ -23132,17 +23134,9 @@ var AnimatorLayerBlendingMode;
                 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 === 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);
-                }
                 // 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));
@@ -23275,6 +23269,7 @@ var AnimatorLayerBlendingMode;
                 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();
@@ -23320,6 +23315,7 @@ var AnimatorLayerBlendingMode;
                 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();
@@ -23366,6 +23362,7 @@ var AnimatorLayerBlendingMode;
                 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();
@@ -23392,6 +23389,7 @@ var AnimatorLayerBlendingMode;
             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);
         }
     };
@@ -23561,11 +23559,11 @@ var AnimatorLayerBlendingMode;
             }
         }
     };
-    _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, [
         {
@@ -23595,13 +23593,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);