@galacean/engine-loader 1.0.0-beta.14 → 1.0.0-beta.16

package/dist/miniprogram.js

@@ -222,7 +222,8 @@ var EnvLoader = /*#__PURE__*/ function(Loader) {
                 var shArray = new Float32Array(arraybuffer, 0, 27);
                 var shByteLength = 27 * 4;
                 var size = (_ref = new Uint16Array(arraybuffer, shByteLength, 1)) == null ? void 0 : _ref[0];
-                var texture = new miniprogram.TextureCube(resourceManager.engine, size);
+                var engine = resourceManager.engine;
+                var texture = new miniprogram.TextureCube(engine, size);
                 texture.filterMode = miniprogram.TextureFilterMode.Trilinear;
                 var mipmapCount = texture.mipmapCount;
                 var offset = shByteLength + 2;
@@ -235,7 +236,7 @@ var EnvLoader = /*#__PURE__*/ function(Loader) {
                         texture.setPixelBuffer(miniprogram.TextureCubeFace.PositiveX + face, data, mipLevel);
                     }
                 }
-                var ambientLight = new miniprogram.AmbientLight();
+                var ambientLight = new miniprogram.AmbientLight(engine);
                 var sh = new miniprogram$1.SphericalHarmonics3();
                 ambientLight.diffuseMode = miniprogram.DiffuseMode.SphericalHarmonics;
                 sh.copyFromArray(shArray);
@@ -2410,8 +2411,14 @@ var GLTFLoader = /*#__PURE__*/ function(Loader) {
             resourceManager.addContentRestorer(restorer);
             masterPromiseInfo.resolve(glTFResource);
         }).catch(function(e) {
-            console.error(e);
-            masterPromiseInfo.reject("Error loading glTF model from " + url + " .");
+            var msg = "Error loading glTF model from " + url + " .";
+            miniprogram.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;
     };
@@ -3963,7 +3970,7 @@ exports.MeshLoader = /*#__PURE__*/ function(Loader) {
                 decode(data, resourceManager.engine).then(function(mesh) {
                     resolve(mesh);
                 });
-            });
+            }).catch(reject);
         });
     };
     return MeshLoader;
@@ -3982,14 +3989,14 @@ exports.EditorTextureLoader = /*#__PURE__*/ function(Loader) {
     var _proto = EditorTextureLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         var _this = this;
-        return new miniprogram.AssetPromise(function(resolve) {
+        return new miniprogram.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;

package/dist/module.js

@@ -217,7 +217,8 @@ var EnvLoader = /*#__PURE__*/ function(Loader) {
                 var shArray = new Float32Array(arraybuffer, 0, 27);
                 var shByteLength = 27 * 4;
                 var size = (_ref = new Uint16Array(arraybuffer, shByteLength, 1)) == null ? void 0 : _ref[0];
-                var texture = new TextureCube(resourceManager.engine, size);
+                var engine = resourceManager.engine;
+                var texture = new TextureCube(engine, size);
                 texture.filterMode = TextureFilterMode.Trilinear;
                 var mipmapCount = texture.mipmapCount;
                 var offset = shByteLength + 2;
@@ -230,7 +231,7 @@ var EnvLoader = /*#__PURE__*/ function(Loader) {
                         texture.setPixelBuffer(TextureCubeFace.PositiveX + face, data, mipLevel);
                     }
                 }
-                var ambientLight = new AmbientLight();
+                var ambientLight = new AmbientLight(engine);
                 var sh = new SphericalHarmonics3();
                 ambientLight.diffuseMode = DiffuseMode.SphericalHarmonics;
                 sh.copyFromArray(shArray);
@@ -2405,8 +2406,14 @@ var GLTFLoader = /*#__PURE__*/ function(Loader) {
             resourceManager.addContentRestorer(restorer);
             masterPromiseInfo.resolve(glTFResource);
         }).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;
     };
@@ -3958,7 +3965,7 @@ var MeshLoader$1 = /*#__PURE__*/ function(Loader) {
                 decode(data, resourceManager.engine).then(function(mesh) {
                     resolve(mesh);
                 });
-            });
+            }).catch(reject);
         });
     };
     return MeshLoader;
@@ -3977,14 +3984,14 @@ var EditorTextureLoader = /*#__PURE__*/ function(Loader) {
     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;