@galacean/engine-loader 1.3.18 → 1.3.20

package/dist/main.js

@@ -1336,9 +1336,9 @@ exports.EditorTextureLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = EditorTextureLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "arraybuffer"
             })).then(function(data) {
                 decode(data, resourceManager.engine).then(function(texture) {
@@ -1378,7 +1378,8 @@ var AnimationClipLoader = /*#__PURE__*/ function(Loader1) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "arraybuffer"
             })).then(function(data) {
                 return decode(data, resourceManager.engine).then(function(clip) {
@@ -1430,7 +1431,8 @@ var AnimatorControllerLoader = /*#__PURE__*/ function(Loader1) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
                 var animatorController = new engineCore.AnimatorController(resourceManager.engine);
@@ -1546,7 +1548,8 @@ var BufferLoader = /*#__PURE__*/ function(Loader1) {
                 resolve(result.buffer);
             });
         }
-        return this.request(url, resourceManager, _extends({}, item, {
+        // @ts-ignore
+        return resourceManager._request(url, _extends({}, item, {
             type: "arraybuffer"
         }));
     };
@@ -1566,9 +1569,9 @@ var EnvLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = EnvLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "arraybuffer"
             })).then(function(arraybuffer) {
                 var _this;
@@ -1650,7 +1653,8 @@ var FontLoader = /*#__PURE__*/ function(Loader1) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
                 var fontName = data.fontName, fontUrl = data.fontUrl;
@@ -2394,28 +2398,29 @@ function registerGLTFParser(pipeline) {
             BIN: 0x004e4942
         };
         var dataView = new DataView(originBuffer);
-        // read header
+        // Read header
         var header = {
             magic: dataView.getUint32(0, true),
             version: dataView.getUint32(UINT32_LENGTH, true),
             length: dataView.getUint32(2 * UINT32_LENGTH, true)
         };
+        // Return the original buffer if it is not a glb
         if (header.magic !== GLB_HEADER_MAGIC) {
             return {
                 originBuffer: originBuffer
             };
         }
-        // read main data
+        // Read main data
         var chunkLength = dataView.getUint32(GLB_HEADER_LENGTH, true);
         var chunkType = dataView.getUint32(GLB_HEADER_LENGTH + UINT32_LENGTH, true);
-        // read glTF json
+        // Read glTF json
         if (chunkType !== GLB_CHUNK_TYPES.JSON) {
             console.error("Invalid glb chunk type. Expected 0x4E4F534A, found 0x" + chunkType.toString(16));
             return null;
         }
         var glTFData = new Uint8Array(originBuffer, GLB_HEADER_LENGTH + 2 * UINT32_LENGTH, chunkLength);
         var glTF = JSON.parse(engineCore.Utils.decodeText(glTFData));
-        // read all buffers
+        // Read all buffers
         var buffers = [];
         var byteOffset = GLB_HEADER_LENGTH + 2 * UINT32_LENGTH + chunkLength;
         var restoreGLBBufferSlice = context.contentRestorer.glbBufferSlices;
@@ -3306,9 +3311,9 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
     /**
    * @internal
    */ _proto.load = function load(item, resourceManager) {
-        var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
-            _this.request(item.url, resourceManager, {
+            resourceManager// @ts-ignore
+            ._request(item.url, {
                 type: "arraybuffer"
             }).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
                 return exports.KTX2Loader._parseBuffer(new Uint8Array(buffer), resourceManager.engine, item.params).then(function(param) {
@@ -3841,18 +3846,23 @@ exports.GLTFSchemaParser = /*#__PURE__*/ function(GLTFParser1) {
     }
     var _proto = GLTFSchemaParser.prototype;
     _proto.parse = function parse(context) {
-        var glTFResource = context.glTFResource, contentRestorer = context.contentRestorer;
+        var glTFResource = context.glTFResource, contentRestorer = context.contentRestorer, resourceManager = context.resourceManager;
         var url = glTFResource.url;
         var restoreBufferRequests = contentRestorer.bufferRequests;
         var requestConfig = {
             type: "arraybuffer"
         };
-        var _context_resourceManager__virtualPathMap_url;
         // @ts-ignore
-        var remoteUrl = (_context_resourceManager__virtualPathMap_url = context.resourceManager._virtualPathMap[url]) != null ? _context_resourceManager__virtualPathMap_url : url;
-        return engineCore.request(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail).then(function(buffer) {
-            restoreBufferRequests.push(new BufferRequestInfo(remoteUrl, requestConfig));
-            return GLTFUtils.parseGLB(context, buffer);
+        var remoteUrl = resourceManager._getRemoteUrl(url);
+        return resourceManager// @ts-ignore
+        ._requestByRemoteUrl(remoteUrl, requestConfig).onProgress(undefined, context._onTaskDetail).then(function(buffer) {
+            var _parseResult;
+            var parseResult = GLTFUtils.parseGLB(context, buffer);
+            // If the buffer is a GLB file, we need to restore the buffer data
+            if ((_parseResult = parseResult) == null ? void 0 : _parseResult.glTF) {
+                restoreBufferRequests.push(new BufferRequestInfo(remoteUrl, requestConfig));
+            }
+            return parseResult;
         }).then(function(result) {
             var _result;
             if ((_result = result) == null ? void 0 : _result.glTF) {
@@ -4077,18 +4087,18 @@ exports.GLTFBufferParser = /*#__PURE__*/ function(GLTFParser1) {
         return context.buffers ? Promise.resolve(context.buffers[index]) : this._parseSingleBuffer(context, buffers[index]);
     };
     _proto._parseSingleBuffer = function _parseSingleBuffer(context, bufferInfo) {
-        var glTFResource = context.glTFResource, contentRestorer = context.contentRestorer;
+        var glTFResource = context.glTFResource, contentRestorer = context.contentRestorer, resourceManager = context.resourceManager;
         var url = glTFResource.url;
-        var _context_resourceManager__virtualPathMap_url;
         // @ts-ignore
-        var remoteUrl = (_context_resourceManager__virtualPathMap_url = context.resourceManager._virtualPathMap[url]) != null ? _context_resourceManager__virtualPathMap_url : url;
+        var remoteUrl = resourceManager._getRemoteUrl(url);
         var restoreBufferRequests = contentRestorer.bufferRequests;
         var requestConfig = {
             type: "arraybuffer"
         };
         var absoluteUrl = engineCore.Utils.resolveAbsoluteUrl(remoteUrl, bufferInfo.uri);
         restoreBufferRequests.push(new BufferRequestInfo(absoluteUrl, requestConfig));
-        var promise = engineCore.request(absoluteUrl, requestConfig).onProgress(undefined, context._onTaskDetail);
+        var promise = resourceManager// @ts-ignore
+        ._requestByRemoteUrl(absoluteUrl, requestConfig).onProgress(undefined, context._onTaskDetail);
         context._addTaskCompletePromise(promise);
         return promise;
     };
@@ -5195,10 +5205,10 @@ var PrefabLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = PrefabLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         var engine = resourceManager.engine;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
                 PrefabParser.parse(engine, item.url, data).then(resolve).catch(reject);
@@ -5223,26 +5233,34 @@ var HDRLoader = (_HDRLoader = // referenece: https://www.flipcode.com/archives/H
     }
     var _proto = HDRLoader1.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
             var engine = resourceManager.engine;
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            var requestConfig = _extends({}, item, {
                 type: "arraybuffer"
-            })).then(function(buffer) {
-                var uint8Array = new Uint8Array(buffer);
-                var _HDRLoader__parseHeader = HDRLoader._parseHeader(uint8Array), width = _HDRLoader__parseHeader.width, height = _HDRLoader__parseHeader.height, dataPosition = _HDRLoader__parseHeader.dataPosition;
-                var pixels = HDRLoader._readPixels(uint8Array.subarray(dataPosition), width, height);
-                var cubeSize = height >> 1;
-                var cubeMapData = HDRLoader._convertToCubemap(pixels, width, height, cubeSize);
-                var texture = new engineCore.TextureCube(engine, cubeSize);
-                for(var faceIndex = 0; faceIndex < 6; faceIndex++){
-                    texture.setPixelBuffer(engineCore.TextureCubeFace.PositiveX + faceIndex, cubeMapData[faceIndex], 0);
-                }
-                texture.generateMipmaps();
+            });
+            resourceManager// @ts-ignore
+            ._request(item.url, requestConfig).then(function(buffer) {
+                var texture = HDRLoader._setTextureByBuffer(engine, buffer);
+                engine.resourceManager.addContentRestorer(new HDRContentRestorer(texture, item.url, requestConfig));
                 resolve(texture);
             }).catch(reject);
         });
     };
+    /**
+   * @internal
+   */ HDRLoader1._setTextureByBuffer = function _setTextureByBuffer(engine, buffer, texture) {
+        var bufferArray = new Uint8Array(buffer);
+        var _HDRLoader__parseHeader = HDRLoader._parseHeader(bufferArray), width = _HDRLoader__parseHeader.width, height = _HDRLoader__parseHeader.height, dataPosition = _HDRLoader__parseHeader.dataPosition;
+        var cubeSize = height >> 1;
+        texture || (texture = new engineCore.TextureCube(engine, cubeSize));
+        var pixels = HDRLoader._readPixels(bufferArray.subarray(dataPosition), width, height);
+        var cubeMapData = HDRLoader._convertToCubemap(pixels, width, height, cubeSize);
+        for(var faceIndex = 0; faceIndex < 6; faceIndex++){
+            texture.setPixelBuffer(engineCore.TextureCubeFace.PositiveX + faceIndex, cubeMapData[faceIndex], 0);
+        }
+        texture.generateMipmaps();
+        return texture;
+    };
     HDRLoader1._convertToCubemap = function _convertToCubemap(pixels, inputWidth, inputHeight, size) {
         if (!pixels) {
             throw "ConvertPanoramaToCubemap: input cannot be null";
@@ -5534,6 +5552,29 @@ HDRLoader = __decorate([
         "hdr"
     ])
 ], HDRLoader);
+/**
+ * @internal
+ */ var HDRContentRestorer = /*#__PURE__*/ function(ContentRestorer1) {
+    _inherits(HDRContentRestorer, ContentRestorer1);
+    function HDRContentRestorer(resource, url, requestConfig) {
+        var _this;
+        _this = ContentRestorer1.call(this, resource) || this;
+        _this.url = url;
+        _this.requestConfig = requestConfig;
+        return _this;
+    }
+    var _proto = HDRContentRestorer.prototype;
+    _proto.restoreContent = function restoreContent() {
+        var _this = this;
+        return new engineCore.AssetPromise(function(resolve, reject) {
+            engineCore.request(_this.url, _this.requestConfig).then(function(buffer) {
+                HDRLoader._setTextureByBuffer(_this.resource.engine, buffer, _this.resource);
+                resolve(_this.resource);
+            }).catch(reject);
+        });
+    };
+    return HDRContentRestorer;
+}(engineCore.ContentRestorer);
 
 var JSONLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(JSONLoader, Loader1);
@@ -5542,7 +5583,8 @@ var JSONLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = JSONLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        return this.request(item.url, resourceManager, _extends({}, item, {
+        // @ts-ignore
+        return resourceManager._request(item.url, _extends({}, item, {
             type: "json"
         }));
     };
@@ -5746,12 +5788,12 @@ var KTXCubeLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = KTXCubeLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
             Promise.all(item.urls.map(function(url) {
-                return _this.request(url, resourceManager, _extends({}, item, {
+                return(// @ts-ignore
+                resourceManager._request(url, _extends({}, item, {
                     type: "arraybuffer"
-                }));
+                })));
             })).then(function(data) {
                 var parsedData = parseCubeKTX(data);
                 var width = parsedData.width, mipmapsFaces = parsedData.mipmapsFaces, engineFormat = parsedData.engineFormat;
@@ -5783,9 +5825,9 @@ var KTXLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = KTXLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "arraybuffer"
             })).then(function(bin) {
                 var parsedData = parseSingleKTX(bin);
@@ -5828,25 +5870,25 @@ var MaterialLoader = /*#__PURE__*/ function(Loader1) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "json"
             })).then(function(materialSchema) {
                 var engine = resourceManager.engine;
                 var shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
-                if (shaderRef) {
+                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);
+                        return _this._getMaterialByShader(materialSchema, shader, engine);
                     }));
-                } else {
-                    // compatible with 1.2-pre version material schema
-                    var shader = engineCore.Shader.find(shaderName);
-                    resolve(_this.getMaterialByShader(materialSchema, shader, engine));
                 }
             }).catch(reject);
         });
     };
-    _proto.getMaterialByShader = function getMaterialByShader(materialSchema, shader, engine) {
+    _proto._getMaterialByShader = function _getMaterialByShader(materialSchema, shader, engine) {
         var _loop = function(key) {
             var _shaderData_key = shaderData[key], type = _shaderData_key.type, value = _shaderData_key.value;
             switch(type){
@@ -5913,9 +5955,9 @@ var MeshLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = MeshLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "arraybuffer"
             })).then(function(data) {
                 return decode(data, resourceManager.engine);
@@ -5940,7 +5982,8 @@ var PrimitiveMeshLoader = /*#__PURE__*/ function(Loader1) {
     var _proto = PrimitiveMeshLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         var engine = resourceManager.engine;
-        return this.request(item.url, resourceManager, _extends({}, item, {
+        return resourceManager// @ts-ignore
+        ._request(item.url, _extends({}, item, {
             type: "json"
         })).then(function(data) {
             switch(data.type){
@@ -5986,10 +6029,10 @@ var ProjectLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = ProjectLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         var engine = resourceManager.engine;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
                 // @ts-ignore
@@ -6021,9 +6064,8 @@ var SourceFontLoader = /*#__PURE__*/ function(Loader1) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            var _resourceManager__virtualPathMap_item_url;
             // @ts-ignore
-            var url = (_resourceManager__virtualPathMap_item_url = resourceManager._virtualPathMap[item.url]) != null ? _resourceManager__virtualPathMap_item_url : item.url;
+            var url = resourceManager._getRemoteUrl(item.url);
             _this._registerFont(url, url).then(function() {
                 var font = new engineCore.Font(resourceManager.engine, url);
                 resolve(font);
@@ -6083,7 +6125,8 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader1) {
                     chainPromises[i].cancel();
                 }
             });
-            var configPromise = _this.request(item.url, resourceManager, _extends({}, item, {
+            // @ts-ignore
+            var configPromise = resourceManager._request(item.url, _extends({}, item, {
                 type: "json"
             }));
             chainPromises.push(configPromise);
@@ -6166,7 +6209,8 @@ var SpriteLoader = /*#__PURE__*/ function(Loader1) {
     var _proto = SpriteLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         var _this = this;
-        return this.request(item.url, resourceManager, _extends({}, item, {
+        return resourceManager// @ts-ignore
+        ._request(item.url, _extends({}, item, {
             type: "json"
         })).then(function(data) {
             return data.belongToAtlas ? _this._loadFromAtlas(resourceManager, data) : _this._loadFromTexture(resourceManager, data);
@@ -6238,13 +6282,13 @@ var Texture2DLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = Texture2DLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
             var url = item.url;
             var requestConfig = _extends({}, item, {
                 type: "image"
             });
-            _this.request(url, resourceManager, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(image) {
+            resourceManager// @ts-ignore
+            ._request(url, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(image) {
                 var _item_params;
                 var _ref = (_item_params = item.params) != null ? _item_params : {}, format = _ref.format, mipmap = _ref.mipmap, anisoLevel = _ref.anisoLevel, wrapModeU = _ref.wrapModeU, wrapModeV = _ref.wrapModeV, filterMode = _ref.filterMode;
                 var texture = new engineCore.Texture2D(resourceManager.engine, image.width, image.height, format, mipmap);
@@ -6315,14 +6359,14 @@ var TextureCubeLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = TextureCubeLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
             var urls = item.urls;
             var requestConfig = _extends({}, item, {
                 type: "image"
             });
+            // @ts-ignore
             Promise.all(urls.map(function(url) {
-                return _this.request(url, resourceManager, requestConfig);
+                return resourceManager._request(url, requestConfig);
             })).then(function(images) {
                 var _images_ = images[0], width = _images_.width, height = _images_.height;
                 if (width !== height) {
@@ -6358,7 +6402,8 @@ var ShaderChunkLoader = (_ShaderChunkLoader = /*#__PURE__*/ function(Loader1) {
     var _proto = ShaderChunkLoader1.prototype;
     _proto.load = function load(item, resourceManager) {
         var url = item.url;
-        return this.request(url, resourceManager, _extends({}, item, {
+        // @ts-ignore
+        return resourceManager._request(url, _extends({}, item, {
             type: "text"
         })).then(function(code) {
             engineCore.ShaderFactory.registerInclude(url.substring(1), code);
@@ -6404,7 +6449,8 @@ var ShaderLoader = (_ShaderLoader = /*#__PURE__*/ function(Loader1) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         var url = item.url;
-        return this.request(url, resourceManager, _extends({}, item, {
+        // @ts-ignore
+        return resourceManager._request(url, _extends({}, item, {
             type: "text"
         })).then(function(code) {
             var builtinShader = _this._getBuiltinShader(code);
@@ -6441,10 +6487,10 @@ var SceneLoader = /*#__PURE__*/ function(Loader1) {
     }
     var _proto = SceneLoader.prototype;
     _proto.load = function load(item, resourceManager) {
-        var _this = this;
         var engine = resourceManager.engine;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, resourceManager, _extends({}, item, {
+            resourceManager// @ts-ignore
+            ._request(item.url, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
                 return SceneParser.parse(engine, data).then(function(scene) {