@galacean/engine-loader 2.0.0-alpha.41 → 2.0.0-alpha.44

package/dist/main.js

@@ -119,10 +119,11 @@ function _create_class(Constructor, protoProps, staticProps) {
 }
 
 var BufferReader = /*#__PURE__*/ function() {
-    function BufferReader(data, byteOffset, byteLength, littleEndian) {
+    function BufferReader(data, byteOffset, byteLength, littleEndian, header) {
         if (byteOffset === void 0) byteOffset = 0;
         if (littleEndian === void 0) littleEndian = true;
         this.data = data;
+        this.header = header;
         this._dataView = new DataView(data.buffer, data.byteOffset + byteOffset, byteLength != null ? byteLength : data.byteLength - byteOffset);
         this._littleEndian = littleEndian;
         this._position = 0;
@@ -322,8 +323,11 @@ exports.AnimationClipDecoder = /*#__PURE__*/ function() {
     function AnimationClipDecoder() {}
     AnimationClipDecoder.decode = function decode(engine, bufferReader) {
         return new engineCore.AssetPromise(function(resolve) {
+            var _bufferReader_header;
             var name = bufferReader.nextStr();
             var clip = new engineCore.AnimationClip(name);
+            var _bufferReader_header_version;
+            var version = (_bufferReader_header_version = (_bufferReader_header = bufferReader.header) == null ? void 0 : _bufferReader_header.version) != null ? _bufferReader_header_version : 1;
             var eventsLen = bufferReader.nextUint16();
             for(var i = 0; i < eventsLen; ++i){
                 var event = new engineCore.AnimationEvent();
@@ -337,6 +341,7 @@ exports.AnimationClipDecoder = /*#__PURE__*/ function() {
                 var relativePath = bufferReader.nextStr();
                 var componentStr = bufferReader.nextStr();
                 var componentType = engineCore.Loader.getClass(componentStr);
+                var typeIndex = version >= 2 ? bufferReader.nextUint16() : 0;
                 var property = bufferReader.nextStr();
                 var getProperty = bufferReader.nextStr();
                 var curve = void 0;
@@ -498,7 +503,7 @@ exports.AnimationClipDecoder = /*#__PURE__*/ function() {
                             break;
                         }
                 }
-                clip.addCurveBinding(relativePath, componentType, property, getProperty, curve);
+                clip.addCurveBinding(relativePath, componentType, typeIndex, property, getProperty, curve);
             }
             resolve(clip);
         });
@@ -1327,8 +1332,8 @@ function _instanceof(left, right) {
     }
     var _proto = PrefabResource.prototype;
     /**
-   * Instantiate prefab.
-   * @returns prefab's root entity
+   * Instantiate the prefab.
+   * @returns A detached prefab instance that must be added to a parent Entity or Scene to update and render
    */ _proto.instantiate = function instantiate() {
         var _this__root;
         return (_this__root = this._root) == null ? void 0 : _this__root.clone();
@@ -1680,7 +1685,7 @@ var MaterialLoaderType = /*#__PURE__*/ function(MaterialLoaderType) {
     }
     var _decoderMap_header_type;
     var header = FileHeader.decode(arrayBuffer);
-    var bufferReader = new BufferReader(new Uint8Array(arrayBuffer), header.headerLength, header.dataLength);
+    var bufferReader = new BufferReader(new Uint8Array(arrayBuffer), header.headerLength, header.dataLength, true, header);
     return (_decoderMap_header_type = decoderMap[header.type]).decode.apply(_decoderMap_header_type, [].concat([
         engine,
         bufferReader
@@ -2483,18 +2488,19 @@ exports.KTX2Loader = /*#__PURE__*/ function(Loader) {
     /**
    * @internal
    */ _proto.load = function load(item, resourceManager) {
+        // @ts-expect-error -- internal method is omitted from public declarations
+        var remoteUrl = resourceManager._getRemoteUrl(item.url);
         return new engineCore.AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
             var requestConfig = _extends({}, item, {
                 type: "arraybuffer"
             });
-            var url = item.url;
             resourceManager// @ts-ignore
-            ._request(url, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
+            ._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
                 return KTX2Loader._parseBuffer(new Uint8Array(buffer), resourceManager.engine, item.params).then(function(param) {
                     var ktx2Container = param.ktx2Container, engine = param.engine, result = param.result, targetFormat = param.targetFormat, params = param.params;
                     return KTX2Loader._createTextureByBuffer(engine, ktx2Container.isSRGB, result, targetFormat, params);
                 }).then(function(texture) {
-                    resourceManager.addContentRestorer(new KTX2ContentRestorer(texture, url, requestConfig));
+                    resourceManager.addContentRestorer(new KTX2ContentRestorer(texture, remoteUrl, requestConfig));
                     resolve(texture);
                 });
             }).catch(reject);
@@ -2678,9 +2684,9 @@ exports.KTX2Loader = __decorate([
 ], exports.KTX2Loader);
 var KTX2ContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
     _inherits(KTX2ContentRestorer, ContentRestorer);
-    function KTX2ContentRestorer(resource, url, requestConfig) {
+    function KTX2ContentRestorer(resource, remoteUrl, requestConfig) {
         var _this;
-        _this = ContentRestorer.call(this, resource) || this, _this.url = url, _this.requestConfig = requestConfig;
+        _this = ContentRestorer.call(this, resource) || this, _this.remoteUrl = remoteUrl, _this.requestConfig = requestConfig;
         return _this;
     }
     var _proto = KTX2ContentRestorer.prototype;
@@ -2690,7 +2696,7 @@ var KTX2ContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
         var engine = resource.engine;
         return new engineCore.AssetPromise(function(resolve, reject) {
             engine.resourceManager// @ts-ignore
-            ._request(_this.url, requestConfig).then(function(buffer) {
+            ._requestByRemoteUrl(_this.remoteUrl, requestConfig).then(function(buffer) {
                 return exports.KTX2Loader._parseBuffer(new Uint8Array(buffer), engine, requestConfig.params).then(function(param) {
                     var ktx2Container = param.ktx2Container, engine = param.engine, result = param.result, targetFormat = param.targetFormat, params = param.params;
                     return exports.KTX2Loader._createTextureByBuffer(engine, ktx2Container.isSRGB, result, targetFormat, params, resource);
@@ -2708,21 +2714,22 @@ var AmbientLightLoader = /*#__PURE__*/ function(Loader) {
     }
     var _proto = AmbientLightLoader.prototype;
     _proto.load = function load(item, resourceManager) {
+        // @ts-expect-error -- internal method is omitted from public declarations
+        var remoteUrl = resourceManager._getRemoteUrl(item.url);
         return new engineCore.AssetPromise(function(resolve, reject) {
             var requestConfig = _extends({}, item, {
                 type: "arraybuffer"
             });
             var engine = resourceManager.engine;
-            var url = item.url;
             resourceManager// @ts-ignore
-            ._request(url, requestConfig).then(function(buffer) {
+            ._requestByRemoteUrl(remoteUrl, requestConfig).then(function(buffer) {
                 var header = FileHeader.decode(buffer);
                 var dataOffset = header.headerLength;
                 var sh = new engineMath.SphericalHarmonics3();
                 sh.copyFromArray(new Float32Array(buffer, dataOffset, 27));
                 var textureOffset = dataOffset + AmbientLightLoader._shByteLength;
                 return AmbientLightLoader._parseTexture(engine, buffer, textureOffset, header.dataLength - AmbientLightLoader._shByteLength).then(function(specularTexture) {
-                    engine.resourceManager.addContentRestorer(new AmbientLightContentRestorer(specularTexture, url, requestConfig));
+                    engine.resourceManager.addContentRestorer(new AmbientLightContentRestorer(specularTexture, remoteUrl, requestConfig));
                     var ambientLight = new engineCore.AmbientLight(engine);
                     ambientLight.diffuseMode = engineCore.DiffuseMode.SphericalHarmonics;
                     ambientLight.diffuseSphericalHarmonics = sh;
@@ -2771,9 +2778,9 @@ AmbientLightLoader = __decorate([
  * @internal
  */ var AmbientLightContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
     _inherits(AmbientLightContentRestorer, ContentRestorer);
-    function AmbientLightContentRestorer(resource, url, requestConfig) {
+    function AmbientLightContentRestorer(resource, remoteUrl, requestConfig) {
         var _this;
-        _this = ContentRestorer.call(this, resource) || this, _this.url = url, _this.requestConfig = requestConfig;
+        _this = ContentRestorer.call(this, resource) || this, _this.remoteUrl = remoteUrl, _this.requestConfig = requestConfig;
         return _this;
     }
     var _proto = AmbientLightContentRestorer.prototype;
@@ -2783,7 +2790,7 @@ AmbientLightLoader = __decorate([
             var resource = _this.resource;
             var engine = resource.engine;
             engine.resourceManager// @ts-ignore
-            ._request(_this.url, _this.requestConfig).then(function(buffer) {
+            ._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(buffer) {
                 var header = FileHeader.decode(buffer);
                 var dataOffset = header.headerLength;
                 var textureOffset = dataOffset + AmbientLightLoader._shByteLength;
@@ -2840,7 +2847,10 @@ var FontLoader = /*#__PURE__*/ function(Loader) {
             })).then(function(data) {
                 var fontName = data.fontName, fontUrl = data.fontUrl;
                 if (fontUrl) {
-                    _this._registerFont(fontName, fontUrl).then(function() {
+                    var absoluteUrl = engineCore.Utils.resolveAbsoluteUrl(item.url, fontUrl);
+                    // @ts-ignore
+                    var remoteUrl = resourceManager._getRemoteUrl(absoluteUrl);
+                    _this._registerFont(fontName, remoteUrl).then(function() {
                         var font = new engineCore.Font(resourceManager.engine, fontName);
                         resolve(font);
                     }).catch(function(e) {
@@ -3093,9 +3103,9 @@ function getMeshoptDecoder() {
     }
     var _proto = GLTFResource.prototype;
     /**
-   * Instantiate scene root entity.
-   * @param sceneIndex - Scene index
-   * @returns Root entity
+   * Instantiate a glTF scene root Entity.
+   * @param sceneIndex - The scene index
+   * @returns A detached scene-root instance that must be added to a parent Entity or Scene to update and render
    */ _proto.instantiateSceneRoot = function instantiateSceneRoot(sceneIndex) {
         var sceneRoot = sceneIndex === undefined ? this._defaultSceneRoot : this._sceneRoots[sceneIndex];
         return sceneRoot.clone();
@@ -3334,6 +3344,8 @@ function getMeshoptDecoder() {
             detail.total = total;
             _this._setTaskDetailProgress(url, loaded, total);
         };
+        // @ts-expect-error -- internal method is omitted from public declarations
+        this._remoteAssetBaseURL = resourceManager._getRemoteUrl(glTFResource.url);
         this.contentRestorer = new GLTFContentRestorer(glTFResource);
     }
     var _proto = GLTFParserContext.prototype;
@@ -3424,7 +3436,7 @@ function getMeshoptDecoder() {
             var _this_glTFResource, _glTFResourceKey;
             ((_this_glTFResource = this.glTFResource)[_glTFResourceKey = glTFResourceKey] || (_this_glTFResource[_glTFResourceKey] = []))[index] = resource;
         } else {
-            var url = this.glTFResource.url;
+            var remoteAssetBaseURL = this._remoteAssetBaseURL;
             resource.then(function(item) {
                 if (index == undefined) {
                     _this.glTFResource[glTFResourceKey] = item;
@@ -3436,15 +3448,15 @@ function getMeshoptDecoder() {
                     for(var i = 0, length = item.length; i < length; i++){
                         var mesh = item[i];
                         // @ts-ignore
-                        _this.resourceManager._onSubAssetSuccess(url, glTFResourceKey + "[" + index + "][" + i + "]", mesh);
+                        _this.resourceManager._onSubAssetSuccess(remoteAssetBaseURL, glTFResourceKey + "[" + index + "][" + i + "]", mesh);
                     }
                 } else {
                     // @ts-ignore
-                    _this.resourceManager._onSubAssetSuccess(url, "" + glTFResourceKey + (index === undefined ? "" : "[" + index + "]"), item);
+                    _this.resourceManager._onSubAssetSuccess(remoteAssetBaseURL, "" + glTFResourceKey + (index === undefined ? "" : "[" + index + "]"), item);
                     var _this_glTF_scene;
                     if (type === 2 && ((_this_glTF_scene = _this.glTF.scene) != null ? _this_glTF_scene : 0) === index) {
                         // @ts-ignore
-                        _this.resourceManager._onSubAssetSuccess(url, "defaultSceneRoot", item);
+                        _this.resourceManager._onSubAssetSuccess(remoteAssetBaseURL, "defaultSceneRoot", item);
                     }
                 }
             }).catch(function(e) {
@@ -4482,16 +4494,16 @@ exports.GLTFBufferParser = /*#__PURE__*/ function(GLTFParser) {
     _proto._parseSingleBuffer = function _parseSingleBuffer(context, bufferInfo) {
         var glTFResource = context.glTFResource, contentRestorer = context.contentRestorer, resourceManager = context.resourceManager;
         var url = glTFResource.url;
+        var absoluteUrl = engineCore.Utils.resolveAbsoluteUrl(url, bufferInfo.uri);
         // @ts-ignore
-        var remoteUrl = resourceManager._getRemoteUrl(url);
+        var remoteUrl = resourceManager._getRemoteUrl(absoluteUrl);
         var restoreBufferRequests = contentRestorer.bufferRequests;
         var requestConfig = {
             type: "arraybuffer"
         };
-        var absoluteUrl = engineCore.Utils.resolveAbsoluteUrl(remoteUrl, bufferInfo.uri);
-        restoreBufferRequests.push(new BufferRequestInfo(absoluteUrl, requestConfig));
+        restoreBufferRequests.push(new BufferRequestInfo(remoteUrl, requestConfig));
         var promise = resourceManager// @ts-ignore
-        ._requestByRemoteUrl(absoluteUrl, requestConfig).onProgress(undefined, context._onTaskDetail);
+        ._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail);
         context._addTaskCompletePromise(promise);
         return promise;
     };
@@ -5709,12 +5721,14 @@ var KTXLoader = /*#__PURE__*/ function(Loader) {
     }
     var _proto = KTXLoader.prototype;
     _proto.load = function load(item, resourceManager) {
+        // @ts-expect-error -- internal method is omitted from public declarations
+        var remoteUrl = resourceManager._getRemoteUrl(item.url);
         var requestConfig = _extends({}, item, {
             type: "arraybuffer"
         });
         return new engineCore.AssetPromise(function(resolve, reject) {
             resourceManager// @ts-ignore
-            ._request(item.url, requestConfig).then(function(bin) {
+            ._requestByRemoteUrl(remoteUrl, requestConfig).then(function(bin) {
                 var parsedData = parseSingleKTX(bin);
                 var width = parsedData.width, height = parsedData.height, mipmaps = parsedData.mipmaps, engineFormat = parsedData.engineFormat;
                 var mipmap = mipmaps.length > 1;
@@ -5723,7 +5737,7 @@ var KTXLoader = /*#__PURE__*/ function(Loader) {
                     var _mipmaps_miplevel = mipmaps[miplevel], width1 = _mipmaps_miplevel.width, height1 = _mipmaps_miplevel.height, data = _mipmaps_miplevel.data;
                     texture.setPixelBuffer(data, miplevel, 0, 0, width1, height1);
                 }
-                resourceManager.addContentRestorer(new KTXContentRestorer(texture, item.url, requestConfig));
+                resourceManager.addContentRestorer(new KTXContentRestorer(texture, remoteUrl, requestConfig));
                 resolve(texture);
             }).catch(function(e) {
                 reject(e);
@@ -5739,9 +5753,9 @@ KTXLoader = __decorate([
 ], KTXLoader);
 var KTXContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
     _inherits(KTXContentRestorer, ContentRestorer);
-    function KTXContentRestorer(resource, url, requestConfig) {
+    function KTXContentRestorer(resource, remoteUrl, requestConfig) {
         var _this;
-        _this = ContentRestorer.call(this, resource) || this, _this.url = url, _this.requestConfig = requestConfig;
+        _this = ContentRestorer.call(this, resource) || this, _this.remoteUrl = remoteUrl, _this.requestConfig = requestConfig;
         return _this;
     }
     var _proto = KTXContentRestorer.prototype;
@@ -5751,7 +5765,7 @@ var KTXContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
         var engine = resource.engine;
         return new engineCore.AssetPromise(function(resolve, reject) {
             engine.resourceManager// @ts-ignore
-            ._request(_this.url, _this.requestConfig).then(function(bin) {
+            ._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(bin) {
                 var mipmaps = parseSingleKTX(bin).mipmaps;
                 for(var miplevel = 0; miplevel < mipmaps.length; miplevel++){
                     var _mipmaps_miplevel = mipmaps[miplevel], width = _mipmaps_miplevel.width, height = _mipmaps_miplevel.height, data = _mipmaps_miplevel.data;
@@ -5766,6 +5780,7 @@ var KTXContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
     return KTXContentRestorer;
 }(engineCore.ContentRestorer);
 
+var materialLoaderTypes = new Set(Object.values(MaterialLoaderType));
 var MaterialLoader = /*#__PURE__*/ function(Loader) {
     _inherits(MaterialLoader, Loader);
     function MaterialLoader() {
@@ -5774,23 +5789,32 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
     var _proto = MaterialLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         var _this = this;
-        return new engineCore.AssetPromise(function(resolve, reject) {
-            resourceManager// @ts-ignore
-            ._request(item.url, _extends({}, item, {
-                type: "json"
-            })).then(function(materialSchema) {
-                var engine = resourceManager.engine;
-                var shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
-                var shader = engineCore.Shader.find(shaderName);
-                if (shader) {
-                    resolve(_this._getMaterialByShader(materialSchema, shader, engine));
-                } else if (shaderRef) {
-                    resolve(resourceManager// @ts-ignore
-                    .getResourceByRef(shaderRef).then(function(shader) {
-                        return _this._getMaterialByShader(materialSchema, shader, engine);
-                    }));
+        // @ts-expect-error _request is @internal
+        return resourceManager._request(item.url, _extends({}, item, {
+            type: "json"
+        })).then(function(materialSchema) {
+            var shaderData = materialSchema.shaderData, shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
+            for(var key in shaderData){
+                var type = shaderData[key].type;
+                if (!materialLoaderTypes.has(type)) {
+                    throw new Error('MaterialLoader: unsupported shader data type "' + type + '".');
                 }
-            }).catch(reject);
+            }
+            var engine = resourceManager.engine;
+            var shader = engineCore.Shader.find(shaderName);
+            if (shader) {
+                return _this._getMaterialByShader(materialSchema, shader, engine);
+            }
+            if (!shaderRef) {
+                throw new Error('MaterialLoader: shader "' + shaderName + '" not found.');
+            }
+            // @ts-expect-error getResourceByRef is @internal
+            return resourceManager.getResourceByRef(shaderRef).then(function(shader) {
+                if (!_instanceof(shader, engineCore.Shader)) {
+                    throw new Error('MaterialLoader: shader reference "' + shaderRef.url + '" did not resolve to a Shader.');
+                }
+                return _this._getMaterialByShader(materialSchema, shader, engine);
+            });
         });
     };
     _proto._getMaterialByShader = function _getMaterialByShader(materialSchema, shader, engine) {
@@ -5813,8 +5837,11 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
                     materialShaderData.setFloat(key, value);
                     break;
                 case MaterialLoaderType.Texture:
-                    texturePromises.push(// @ts-ignore
+                    texturePromises.push(// @ts-expect-error getResourceByRef is @internal
                     engine.resourceManager.getResourceByRef(value).then(function(texture) {
+                        if (!_instanceof(texture, engineCore.Texture)) {
+                            throw new Error('MaterialLoader: texture reference "' + value.url + '" did not resolve to a Texture.');
+                        }
                         materialShaderData.setTexture(key, texture);
                     }));
                     break;
@@ -5824,6 +5851,8 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
                 case MaterialLoaderType.Integer:
                     materialShaderData.setInt(key, Number(value));
                     break;
+                default:
+                    throw new Error('MaterialLoader: unsupported shader data type "' + type + '".');
             }
         };
         var name = materialSchema.name, shaderData = materialSchema.shaderData, macros = materialSchema.macros;
@@ -5842,6 +5871,9 @@ var MaterialLoader = /*#__PURE__*/ function(Loader) {
         }
         return Promise.all(texturePromises).then(function() {
             return material;
+        }, function(error) {
+            material.destroy();
+            throw error;
         });
     };
     return MaterialLoader;
@@ -5862,13 +5894,14 @@ var MeshLoader = /*#__PURE__*/ function(Loader) {
         var requestConfig = _extends({}, item, {
             type: "arraybuffer"
         });
-        var url = item.url;
+        // @ts-expect-error -- internal method is omitted from public declarations
+        var remoteUrl = resourceManager._getRemoteUrl(item.url);
         return new engineCore.AssetPromise(function(resolve, reject) {
             resourceManager// @ts-ignore
-            ._request(url, requestConfig).then(function(data) {
+            ._requestByRemoteUrl(remoteUrl, requestConfig).then(function(data) {
                 return decode(data, resourceManager.engine);
             }).then(function(mesh) {
-                resourceManager.addContentRestorer(new MeshContentRestorer(mesh, url, requestConfig));
+                resourceManager.addContentRestorer(new MeshContentRestorer(mesh, remoteUrl, requestConfig));
                 resolve(mesh);
             }).catch(reject);
         });
@@ -5882,9 +5915,9 @@ MeshLoader = __decorate([
 ], MeshLoader);
 var MeshContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
     _inherits(MeshContentRestorer, ContentRestorer);
-    function MeshContentRestorer(resource, url, requestConfig) {
+    function MeshContentRestorer(resource, remoteUrl, requestConfig) {
         var _this;
-        _this = ContentRestorer.call(this, resource) || this, _this.url = url, _this.requestConfig = requestConfig;
+        _this = ContentRestorer.call(this, resource) || this, _this.remoteUrl = remoteUrl, _this.requestConfig = requestConfig;
         return _this;
     }
     var _proto = MeshContentRestorer.prototype;
@@ -5894,7 +5927,7 @@ var MeshContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
         var engine = resource.engine;
         return new engineCore.AssetPromise(function(resolve, reject) {
             engine.resourceManager// @ts-ignore
-            ._request(_this.url, _this.requestConfig).then(function(data) {
+            ._requestByRemoteUrl(_this.remoteUrl, _this.requestConfig).then(function(data) {
                 return decode(data, engine, resource);
             }).then(function(mesh) {
                 resolve(mesh);
@@ -6200,14 +6233,16 @@ var TextureLoader = /*#__PURE__*/ function(Loader) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         var url = item.url;
+        // @ts-expect-error -- internal method is omitted from public declarations
+        var remoteUrl = resourceManager._getRemoteUrl(url);
         var requestConfig = _extends({}, item, {
             type: "arraybuffer"
         });
         return new engineCore.AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
             resourceManager// @ts-ignore
-            ._request(url, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
+            ._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
                 _this._decode(buffer, item, resourceManager).then(function(texture) {
-                    resourceManager.addContentRestorer(new TextureContentRestorer(texture, url, requestConfig));
+                    resourceManager.addContentRestorer(new TextureContentRestorer(texture, url, remoteUrl, requestConfig));
                     resolve(texture);
                 }, reject);
             }).catch(reject);
@@ -6244,29 +6279,17 @@ var TextureLoader = /*#__PURE__*/ function(Loader) {
     };
     _proto._decodeImage = function _decodeImage(buffer, item, resourceManager) {
         var _this = this;
-        return new engineCore.AssetPromise(function(resolve, reject) {
-            var blob = new Blob([
-                buffer
-            ]);
-            var img = new Image();
-            img.onload = function() {
-                URL.revokeObjectURL(img.src);
-                var _item_params;
-                var _ref = (_item_params = item.params) != null ? _item_params : {}, _ref_format = _ref.format, format = _ref_format === void 0 ? engineCore.TextureFormat.R8G8B8A8 : _ref_format, _ref_isSRGBColorSpace = _ref.isSRGBColorSpace, isSRGBColorSpace = _ref_isSRGBColorSpace === void 0 ? true : _ref_isSRGBColorSpace, _ref_mipmap = _ref.mipmap, mipmap = _ref_mipmap === void 0 ? true : _ref_mipmap;
-                var engine = resourceManager.engine;
-                var width = img.width, height = img.height;
-                var generateMipmap = engineCore.TextureUtils.supportGenerateMipmapsWithCorrection(engine, width, height, format, mipmap, isSRGBColorSpace);
-                var texture = new engineCore.Texture2D(engine, width, height, format, generateMipmap, isSRGBColorSpace);
-                texture.setImageSource(img);
-                generateMipmap && texture.generateMipmaps();
-                _this._applyParams(texture, item);
-                resolve(texture);
-            };
-            img.onerror = function(e) {
-                URL.revokeObjectURL(img.src);
-                reject(e);
-            };
-            img.src = URL.createObjectURL(blob);
+        return decodeImage(buffer, item.url).then(function(img) {
+            var _item_params;
+            var _ref = (_item_params = item.params) != null ? _item_params : {}, _ref_format = _ref.format, format = _ref_format === void 0 ? engineCore.TextureFormat.R8G8B8A8 : _ref_format, _ref_isSRGBColorSpace = _ref.isSRGBColorSpace, isSRGBColorSpace = _ref_isSRGBColorSpace === void 0 ? true : _ref_isSRGBColorSpace, _ref_mipmap = _ref.mipmap, mipmap = _ref_mipmap === void 0 ? true : _ref_mipmap;
+            var engine = resourceManager.engine;
+            var width = img.width, height = img.height;
+            var generateMipmap = engineCore.TextureUtils.supportGenerateMipmapsWithCorrection(engine, width, height, format, mipmap, isSRGBColorSpace);
+            var texture = new engineCore.Texture2D(engine, width, height, format, generateMipmap, isSRGBColorSpace);
+            texture.setImageSource(img);
+            generateMipmap && texture.generateMipmaps();
+            _this._applyParams(texture, item);
+            return texture;
         });
     };
     _proto._applyParams = function _applyParams(texture, item) {
@@ -6295,16 +6318,16 @@ TextureLoader = __decorate([
 ], TextureLoader);
 var TextureContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
     _inherits(TextureContentRestorer, ContentRestorer);
-    function TextureContentRestorer(resource, url, requestConfig) {
+    function TextureContentRestorer(resource, url, remoteUrl, requestConfig) {
         var _this;
-        _this = ContentRestorer.call(this, resource) || this, _this.url = url, _this.requestConfig = requestConfig;
+        _this = ContentRestorer.call(this, resource) || this, _this.url = url, _this.remoteUrl = remoteUrl, _this.requestConfig = requestConfig;
         return _this;
     }
     var _proto = TextureContentRestorer.prototype;
     _proto.restoreContent = function restoreContent() {
         var _this = this;
         return this.resource.engine.resourceManager// @ts-ignore
-        ._request(this.url, this.requestConfig).then(function(buffer) {
+        ._requestByRemoteUrl(this.remoteUrl, this.requestConfig).then(function(buffer) {
             if (FileHeader.checkMagic(buffer)) {
                 return decode(buffer, _this.resource.engine, _this.resource);
             }
@@ -6316,27 +6339,35 @@ var TextureContentRestorer = /*#__PURE__*/ function(ContentRestorer) {
                 texture.mipmapCount > 1 && texture.generateMipmaps();
                 return texture;
             }
-            return new engineCore.AssetPromise(function(resolve, reject) {
-                var blob = new Blob([
-                    buffer
-                ]);
-                var img = new Image();
-                img.onload = function() {
-                    URL.revokeObjectURL(img.src);
-                    texture.setImageSource(img);
-                    texture.mipmapCount > 1 && texture.generateMipmaps();
-                    resolve(texture);
-                };
-                img.onerror = function(e) {
-                    URL.revokeObjectURL(img.src);
-                    reject(e);
-                };
-                img.src = URL.createObjectURL(blob);
+            return decodeImage(buffer, _this.url).then(function(img) {
+                texture.setImageSource(img);
+                texture.mipmapCount > 1 && texture.generateMipmaps();
+                return texture;
             });
         });
     };
     return TextureContentRestorer;
 }(engineCore.ContentRestorer);
+function decodeImage(buffer, url) {
+    return new engineCore.AssetPromise(function(resolve, reject) {
+        var objectUrl = URL.createObjectURL(new Blob([
+            buffer
+        ]));
+        var image = new Image();
+        var releaseObjectUrl = function() {
+            return URL.revokeObjectURL(objectUrl);
+        };
+        image.onload = function() {
+            releaseObjectUrl();
+            resolve(image);
+        };
+        image.onerror = function() {
+            releaseObjectUrl();
+            reject(new Error('TextureLoader: failed to decode texture "' + url + '" (' + buffer.byteLength + " bytes)."));
+        };
+        image.src = objectUrl;
+    });
+}
 
 var AudioLoader = /*#__PURE__*/ function(Loader) {
     _inherits(AudioLoader, Loader);
@@ -6401,11 +6432,11 @@ var ShaderLoader = /*#__PURE__*/ function(Loader) {
             type: "text"
         })).then(function(code) {
             var source = code.trimStart();
-            if (source.startsWith("{")) {
-                // @ts-expect-error _createFromPrecompiled is @internal
-                return engineCore.Shader._createFromPrecompiled(JSON.parse(source));
+            var shader = source.startsWith("{") ? engineCore.Shader._createFromPrecompiled(JSON.parse(source)) : engineCore.Shader.create(code, undefined, url);
+            if (!shader) {
+                throw new Error('ShaderLoader: failed to create shader "' + url + '".');
             }
-            return engineCore.Shader.create(code, undefined, url);
+            return shader;
         });
     };
     return ShaderLoader;
@@ -6453,8 +6484,10 @@ var RenderTargetLoader = /*#__PURE__*/ function(Loader) {
     var _proto = RenderTargetLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         var engine = resourceManager.engine;
+        // @ts-expect-error -- internal method is omitted from public declarations
+        var remoteAssetBaseURL = resourceManager._getRemoteUrl(item.url);
         return resourceManager// @ts-ignore
-        ._request(item.url, _extends({}, item, {
+        ._requestByRemoteUrl(remoteAssetBaseURL, _extends({}, item, {
             type: "json"
         })).then(function(data) {
             var width = data.width, height = data.height, colorFormats = data.colorFormats, depthFormat = data.depthFormat, antiAliasing = data.antiAliasing, autoGenerateMipmaps = data.autoGenerateMipmaps;
@@ -6480,7 +6513,7 @@ var RenderTargetLoader = /*#__PURE__*/ function(Loader) {
             // Notify pending sub-asset requests for colorTextures
             for(var i = 0, n = colorTextures.length; i < n; i++){
                 // @ts-ignore
-                resourceManager._onSubAssetSuccess(item.url, "colorTextures[" + i + "]", colorTextures[i]);
+                resourceManager._onSubAssetSuccess(remoteAssetBaseURL, "colorTextures[" + i + "]", colorTextures[i]);
             }
             return rt;
         });