@galacean/engine-physics-physx 0.9.19 → 0.9.20

package/dist/miniprogram.js

@@ -18205,18 +18205,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) {
@@ -18303,23 +18295,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$2.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$2.window.setTimeout(_this.exec, _this.interval);
         });
     };
     return MultiExecutor;
@@ -27499,8 +27501,14 @@ var GLTFLoader = /*#__PURE__*/ function(Loader) {
             }
         });
         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 + " .";
+            miniprogram$5.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;
     };
@@ -29029,7 +29037,7 @@ exports.MeshLoader = /*#__PURE__*/ function(Loader) {
                 decode(data, resourceManager.engine).then(function(mesh) {
                     resolve(mesh);
                 });
-            });
+            }).catch(reject);
         });
     };
     return MeshLoader;
@@ -29047,14 +29055,14 @@ exports.EditorTextureLoader = /*#__PURE__*/ function(Loader) {
     var _proto = EditorTextureLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         var _this = this;
-        return new miniprogram$5.AssetPromise(function(resolve) {
+        return new miniprogram$5.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;
@@ -36249,7 +36257,7 @@ function _interopNamespace(e) {
 }
 var CoreObjects__namespace = /*#__PURE__*/ _interopNamespace(CoreObjects);
 //@ts-ignore
-var version = "0.9.19";
+var version = "0.9.20";
 console.log("Galacean engine version: " + version);
 for(var key in CoreObjects__namespace){
     CoreObjects.Loader.registerClass(key, CoreObjects__namespace[key]);