@galacean/engine 0.9.18 → 0.9.20

package/dist/browser.js

@@ -22946,18 +22946,10 @@
             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) {
@@ -23044,23 +23036,33 @@
             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;
@@ -26002,6 +26004,7 @@
                 curKeyframeIndex: 0,
                 value: null
             };
+            this.updateMark = 0;
             this.target = target;
             this.type = type;
             this.property = property;
@@ -27442,9 +27445,9 @@
             _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,
@@ -27529,7 +27532,7 @@
                 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) {
@@ -27579,7 +27582,6 @@
                 }
             }
             this._animatorLayersData.length = 0;
-            this._needRevertCurveOwners.length = 0;
             this._curveOwnerPool = {};
             this._animationEventHandlerPool.resetPool();
             if (this._controllerUpdateFlag) {
@@ -27630,17 +27632,9 @@
                     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));
@@ -27773,6 +27767,7 @@
                     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();
@@ -27818,6 +27813,7 @@
                     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();
@@ -27864,6 +27860,7 @@
                     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();
@@ -27890,6 +27887,7 @@
                 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);
             }
         };
@@ -28059,11 +28057,11 @@
                 }
             }
         };
-        _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$3(Animator, [
             {
@@ -28093,13 +28091,13 @@
     ], 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);
@@ -34401,8 +34399,14 @@
                 }
             });
             GLTFParser.defaultPipeline.parse(context).then(masterPromiseInfo.resolve).catch(function(e) {
-                console.error(e);
-                masterPromiseInfo.reject("Error loading glTF model from " + url + " .");
+                var msg = "Error loading glTF model from " + url + " .";
+                Logger.error(msg);
+                masterPromiseInfo.reject(msg);
+                context.defaultSceneRootPromiseInfo.reject(e);
+                context.texturesPromiseInfo.reject(e);
+                context.materialsPromiseInfo.reject(e);
+                context.meshesPromiseInfo.reject(e);
+                context.animationClipsPromiseInfo.reject(e);
             });
             return context.promiseMap;
         };
@@ -35931,7 +35935,7 @@
                     decode(data, resourceManager.engine).then(function(mesh) {
                         resolve(mesh);
                     });
-                });
+                }).catch(reject);
             });
         };
         return MeshLoader;
@@ -35949,14 +35953,14 @@
         var _proto = EditorTextureLoader.prototype;
         _proto.load = function load(item, resourceManager) {
             var _this = this;
-            return new AssetPromise(function(resolve) {
+            return new AssetPromise(function(resolve, reject) {
                 _this.request(item.url, {
                     type: "arraybuffer"
                 }).then(function(data) {
                     decode(data, resourceManager.engine).then(function(texture) {
                         resolve(texture);
                     });
-                });
+                }).catch(reject);
             });
         };
         return EditorTextureLoader;
@@ -36386,7 +36390,7 @@
     }));
 
     //@ts-ignore
-    var version = "0.9.18";
+    var version = "0.9.20";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);