@galacean/engine-loader 1.0.0-beta.13 → 1.0.0-beta.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +11 -5
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +11 -5
- package/dist/module.js +11 -5
- package/dist/module.js.map +1 -1
- package/package.json +5 -5
- package/types/gltf/GLTFUtil.d.ts +3 -3
package/dist/main.js
CHANGED
|
@@ -2409,8 +2409,14 @@ var GLTFLoader = /*#__PURE__*/ function(Loader) {
|
|
|
2409
2409
|
resourceManager.addContentRestorer(restorer);
|
|
2410
2410
|
masterPromiseInfo.resolve(glTFResource);
|
|
2411
2411
|
}).catch(function(e) {
|
|
2412
|
-
|
|
2413
|
-
|
|
2412
|
+
var msg = "Error loading glTF model from " + url + " .";
|
|
2413
|
+
engineCore.Logger.error(msg);
|
|
2414
|
+
masterPromiseInfo.reject(msg);
|
|
2415
|
+
context.defaultSceneRootPromiseInfo.reject(e);
|
|
2416
|
+
context.texturesPromiseInfo.reject(e);
|
|
2417
|
+
context.materialsPromiseInfo.reject(e);
|
|
2418
|
+
context.meshesPromiseInfo.reject(e);
|
|
2419
|
+
context.animationClipsPromiseInfo.reject(e);
|
|
2414
2420
|
});
|
|
2415
2421
|
return context.promiseMap;
|
|
2416
2422
|
};
|
|
@@ -3962,7 +3968,7 @@ exports.MeshLoader = /*#__PURE__*/ function(Loader) {
|
|
|
3962
3968
|
decode(data, resourceManager.engine).then(function(mesh) {
|
|
3963
3969
|
resolve(mesh);
|
|
3964
3970
|
});
|
|
3965
|
-
});
|
|
3971
|
+
}).catch(reject);
|
|
3966
3972
|
});
|
|
3967
3973
|
};
|
|
3968
3974
|
return MeshLoader;
|
|
@@ -3981,14 +3987,14 @@ exports.EditorTextureLoader = /*#__PURE__*/ function(Loader) {
|
|
|
3981
3987
|
var _proto = EditorTextureLoader.prototype;
|
|
3982
3988
|
_proto.load = function load(item, resourceManager) {
|
|
3983
3989
|
var _this = this;
|
|
3984
|
-
return new engineCore.AssetPromise(function(resolve) {
|
|
3990
|
+
return new engineCore.AssetPromise(function(resolve, reject) {
|
|
3985
3991
|
_this.request(item.url, {
|
|
3986
3992
|
type: "arraybuffer"
|
|
3987
3993
|
}).then(function(data) {
|
|
3988
3994
|
decode(data, resourceManager.engine).then(function(texture) {
|
|
3989
3995
|
resolve(texture);
|
|
3990
3996
|
});
|
|
3991
|
-
});
|
|
3997
|
+
}).catch(reject);
|
|
3992
3998
|
});
|
|
3993
3999
|
};
|
|
3994
4000
|
return EditorTextureLoader;
|