@galacean/engine-loader 1.3.16 → 1.3.17

package/dist/main.js

@@ -932,6 +932,18 @@ exports.AnimationClipDecoder = __decorate([
     decoder("AnimationClip")
 ], exports.AnimationClipDecoder);
 
+exports.MaterialLoaderType = void 0;
+(function(MaterialLoaderType) {
+    MaterialLoaderType["Vector2"] = "Vector2";
+    MaterialLoaderType["Vector3"] = "Vector3";
+    MaterialLoaderType["Vector4"] = "Vector4";
+    MaterialLoaderType["Color"] = "Color";
+    MaterialLoaderType["Float"] = "Float";
+    MaterialLoaderType["Texture"] = "Texture";
+    MaterialLoaderType["Boolean"] = "Boolean";
+    MaterialLoaderType["Integer"] = "Integer";
+})(exports.MaterialLoaderType || (exports.MaterialLoaderType = {}));
+
 exports.SpecularMode = void 0;
 (function(SpecularMode) {
     SpecularMode["Sky"] = "Sky";
@@ -1317,32 +1329,6 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
     return SceneParser;
 }(HierarchyParser);
 
-exports.MeshLoader = /*#__PURE__*/ function(Loader1) {
-    _inherits(MeshLoader, Loader1);
-    function MeshLoader() {
-        return Loader1.apply(this, arguments);
-    }
-    var _proto = MeshLoader.prototype;
-    _proto.load = function load(item, resourceManager) {
-        var _this = this;
-        return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, _extends({}, item, {
-                type: "arraybuffer"
-            })).then(function(data) {
-                decode(data, resourceManager.engine).then(function(mesh) {
-                    resolve(mesh);
-                });
-            }).catch(reject);
-        });
-    };
-    return MeshLoader;
-}(engineCore.Loader);
-exports.MeshLoader = __decorate([
-    engineCore.resourceLoader("Mesh", [
-        "prefab"
-    ], true)
-], exports.MeshLoader);
-
 exports.EditorTextureLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(EditorTextureLoader, Loader1);
     function EditorTextureLoader() {
@@ -1352,7 +1338,7 @@ exports.EditorTextureLoader = /*#__PURE__*/ function(Loader1) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "arraybuffer"
             })).then(function(data) {
                 decode(data, resourceManager.engine).then(function(texture) {
@@ -1392,7 +1378,7 @@ 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, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "arraybuffer"
             })).then(function(data) {
                 return decode(data, resourceManager.engine).then(function(clip) {
@@ -1444,7 +1430,7 @@ 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, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
                 var animatorController = new engineCore.AnimatorController(resourceManager.engine);
@@ -1549,7 +1535,7 @@ var BufferLoader = /*#__PURE__*/ function(Loader1) {
         return Loader1.apply(this, arguments);
     }
     var _proto = BufferLoader.prototype;
-    _proto.load = function load(item) {
+    _proto.load = function load(item, resourceManager) {
         var url = item.url;
         if (isBase64(url)) {
             return new engineCore.AssetPromise(function(resolve) {
@@ -1560,7 +1546,7 @@ var BufferLoader = /*#__PURE__*/ function(Loader1) {
                 resolve(result.buffer);
             });
         }
-        return this.request(url, _extends({}, item, {
+        return this.request(url, resourceManager, _extends({}, item, {
             type: "arraybuffer"
         }));
     };
@@ -1582,7 +1568,7 @@ var EnvLoader = /*#__PURE__*/ function(Loader1) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "arraybuffer"
             })).then(function(arraybuffer) {
                 var _this;
@@ -1664,7 +1650,7 @@ 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, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
                 var fontName = data.fontName, fontUrl = data.fontUrl;
@@ -3322,7 +3308,7 @@ exports.KTX2Loader = (_KTX2Loader = /*#__PURE__*/ function(Loader1) {
    */ _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
-            _this.request(item.url, {
+            _this.request(item.url, resourceManager, {
                 type: "arraybuffer"
             }).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(buffer) {
                 return exports.KTX2Loader._parseBuffer(new Uint8Array(buffer), resourceManager.engine, item.params).then(function(param) {
@@ -3861,8 +3847,11 @@ exports.GLTFSchemaParser = /*#__PURE__*/ function(GLTFParser1) {
         var requestConfig = {
             type: "arraybuffer"
         };
-        return engineCore.request(url, requestConfig).onProgress(undefined, context._onTaskDetail).then(function(buffer) {
-            restoreBufferRequests.push(new BufferRequestInfo(url, requestConfig));
+        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);
         }).then(function(result) {
             var _result;
@@ -4090,11 +4079,14 @@ exports.GLTFBufferParser = /*#__PURE__*/ function(GLTFParser1) {
     _proto._parseSingleBuffer = function _parseSingleBuffer(context, bufferInfo) {
         var glTFResource = context.glTFResource, contentRestorer = context.contentRestorer;
         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 restoreBufferRequests = contentRestorer.bufferRequests;
         var requestConfig = {
             type: "arraybuffer"
         };
-        var absoluteUrl = engineCore.Utils.resolveAbsoluteUrl(url, bufferInfo.uri);
+        var absoluteUrl = engineCore.Utils.resolveAbsoluteUrl(remoteUrl, bufferInfo.uri);
         restoreBufferRequests.push(new BufferRequestInfo(absoluteUrl, requestConfig));
         var promise = engineCore.request(absoluteUrl, requestConfig).onProgress(undefined, context._onTaskDetail);
         context._addTaskCompletePromise(promise);
@@ -5138,9 +5130,8 @@ exports.GLTFLoader = /*#__PURE__*/ function(Loader1) {
         return Promise.resolve();
     };
     _proto.load = function load(item, resourceManager) {
-        var url = item.url;
         var params = item.params;
-        var glTFResource = new GLTFResource(resourceManager.engine, url);
+        var glTFResource = new GLTFResource(resourceManager.engine, item.url);
         var context = new GLTFParserContext(glTFResource, resourceManager, _extends({
             keepMeshData: false
         }, params));
@@ -5207,7 +5198,7 @@ var PrefabLoader = /*#__PURE__*/ function(Loader1) {
         var _this = this;
         var engine = resourceManager.engine;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
                 PrefabParser.parse(engine, item.url, data).then(resolve).catch(reject);
@@ -5235,7 +5226,7 @@ var HDRLoader = (_HDRLoader = // referenece: https://www.flipcode.com/archives/H
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
             var engine = resourceManager.engine;
-            _this.request(item.url, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "arraybuffer"
             })).then(function(buffer) {
                 var uint8Array = new Uint8Array(buffer);
@@ -5550,8 +5541,8 @@ var JSONLoader = /*#__PURE__*/ function(Loader1) {
         return Loader1.apply(this, arguments);
     }
     var _proto = JSONLoader.prototype;
-    _proto.load = function load(item) {
-        return this.request(item.url, _extends({}, item, {
+    _proto.load = function load(item, resourceManager) {
+        return this.request(item.url, resourceManager, _extends({}, item, {
             type: "json"
         }));
     };
@@ -5758,7 +5749,7 @@ var KTXCubeLoader = /*#__PURE__*/ function(Loader1) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
             Promise.all(item.urls.map(function(url) {
-                return _this.request(url, _extends({}, item, {
+                return _this.request(url, resourceManager, _extends({}, item, {
                     type: "arraybuffer"
                 }));
             })).then(function(data) {
@@ -5794,7 +5785,7 @@ var KTXLoader = /*#__PURE__*/ function(Loader1) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "arraybuffer"
             })).then(function(bin) {
                 var parsedData = parseSingleKTX(bin);
@@ -5837,63 +5828,76 @@ 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, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "json"
             })).then(function(materialSchema) {
-                var _loop = function(key) {
-                    var _shaderData_key = shaderData[key], type = _shaderData_key.type, value = _shaderData_key.value;
-                    switch(type){
-                        case "Vector2":
-                            materialShaderData.setVector2(key, new engineMath.Vector2(value.x, value.y));
-                            break;
-                        case "Vector3":
-                            materialShaderData.setVector3(key, new engineMath.Vector3(value.x, value.y, value.z));
-                            break;
-                        case "Vector4":
-                            materialShaderData.setVector4(key, new engineMath.Vector4(value.x, value.y, value.z, value.w));
-                            break;
-                        case "Color":
-                            materialShaderData.setColor(key, new engineMath.Color(value.r, value.g, value.b, value.a));
-                            break;
-                        case "Float":
-                            materialShaderData.setFloat(key, value);
-                            break;
-                        case "Texture":
-                            texturePromises.push(// @ts-ignore
-                            resourceManager.getResourceByRef(value).then(function(texture) {
-                                materialShaderData.setTexture(key, texture);
-                            }));
-                            break;
-                        case "Boolean":
-                            materialShaderData.setInt(key, value ? 1 : 0);
-                            break;
-                        case "Integer":
-                            materialShaderData.setInt(key, Number(value));
-                            break;
-                    }
-                };
                 var engine = resourceManager.engine;
-                var name = materialSchema.name, shader = materialSchema.shader, shaderData = materialSchema.shaderData, macros = materialSchema.macros, renderState = materialSchema.renderState;
-                var material = new engineCore.Material(engine, engineCore.Shader.find(shader));
-                material.name = name;
-                var texturePromises = new Array();
-                var materialShaderData = material.shaderData;
-                for(var key in shaderData)_loop(key);
-                for(var i = 0, length = macros.length; i < length; i++){
-                    var _macros_i = macros[i], name1 = _macros_i.name, value = _macros_i.value;
-                    if (value == undefined) {
-                        materialShaderData.enableMacro(name1);
-                    } else {
-                        materialShaderData.enableMacro(name1, value);
-                    }
+                var shaderRef = materialSchema.shaderRef, shaderName = materialSchema.shader;
+                if (shaderRef) {
+                    resolve(resourceManager// @ts-ignore
+                    .getResourceByRef(shaderRef).then(function(shader) {
+                        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));
                 }
-                parseProperty(material, "renderState", renderState);
-                return Promise.all(texturePromises).then(function() {
-                    resolve(material);
-                });
             }).catch(reject);
         });
     };
+    _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){
+                case exports.MaterialLoaderType.Vector2:
+                    materialShaderData.setVector2(key, new engineMath.Vector2(value.x, value.y));
+                    break;
+                case exports.MaterialLoaderType.Vector3:
+                    materialShaderData.setVector3(key, new engineMath.Vector3(value.x, value.y, value.z));
+                    break;
+                case exports.MaterialLoaderType.Vector4:
+                    materialShaderData.setVector4(key, new engineMath.Vector4(value.x, value.y, value.z, value.w));
+                    break;
+                case exports.MaterialLoaderType.Color:
+                    materialShaderData.setColor(key, new engineMath.Color(value.r, value.g, value.b, value.a));
+                    break;
+                case exports.MaterialLoaderType.Float:
+                    materialShaderData.setFloat(key, value);
+                    break;
+                case exports.MaterialLoaderType.Texture:
+                    texturePromises.push(// @ts-ignore
+                    engine.resourceManager.getResourceByRef(value).then(function(texture) {
+                        materialShaderData.setTexture(key, texture);
+                    }));
+                    break;
+                case exports.MaterialLoaderType.Boolean:
+                    materialShaderData.setInt(key, value ? 1 : 0);
+                    break;
+                case exports.MaterialLoaderType.Integer:
+                    materialShaderData.setInt(key, Number(value));
+                    break;
+            }
+        };
+        var name = materialSchema.name, shaderData = materialSchema.shaderData, macros = materialSchema.macros, renderState = materialSchema.renderState;
+        var material = new engineCore.Material(engine, shader);
+        material.name = name;
+        var texturePromises = new Array();
+        var materialShaderData = material.shaderData;
+        for(var key in shaderData)_loop(key);
+        for(var i = 0, length = macros.length; i < length; i++){
+            var _macros_i = macros[i], name1 = _macros_i.name, value = _macros_i.value;
+            if (value == undefined) {
+                materialShaderData.enableMacro(name1);
+            } else {
+                materialShaderData.enableMacro(name1, value);
+            }
+        }
+        parseProperty(material, "renderState", renderState);
+        return Promise.all(texturePromises).then(function() {
+            return material;
+        });
+    };
     return MaterialLoader;
 }(engineCore.Loader);
 MaterialLoader = __decorate([
@@ -5902,41 +5906,15 @@ MaterialLoader = __decorate([
     ])
 ], MaterialLoader);
 
-var MeshLoader = /*#__PURE__*/ function(Loader1) {
-    _inherits(MeshLoader, Loader1);
-    function MeshLoader() {
-        return Loader1.apply(this, arguments);
-    }
-    var _proto = MeshLoader.prototype;
-    _proto.load = function load(item, resourceManager) {
-        var _this = this;
-        return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, _extends({}, item, {
-                type: "arraybuffer"
-            })).then(function(data) {
-                return decode(data, resourceManager.engine);
-            }).then(function(mesh) {
-                resolve(mesh);
-            }).catch(reject);
-        });
-    };
-    return MeshLoader;
-}(engineCore.Loader);
-MeshLoader = __decorate([
-    engineCore.resourceLoader(engineCore.AssetType.Mesh, [
-        "mesh"
-    ])
-], MeshLoader);
-
 var PrimitiveMeshLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(PrimitiveMeshLoader, Loader1);
     function PrimitiveMeshLoader() {
         return Loader1.apply(this, arguments);
     }
     var _proto = PrimitiveMeshLoader.prototype;
-    _proto.load = function load(item, param) {
-        var engine = param.engine;
-        return this.request(item.url, _extends({}, item, {
+    _proto.load = function load(item, resourceManager) {
+        var engine = resourceManager.engine;
+        return this.request(item.url, resourceManager, _extends({}, item, {
             type: "json"
         })).then(function(data) {
             switch(data.type){
@@ -5985,7 +5963,7 @@ var ProjectLoader = /*#__PURE__*/ function(Loader1) {
         var _this = this;
         var engine = resourceManager.engine;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
                 // @ts-ignore
@@ -6017,7 +5995,9 @@ var SourceFontLoader = /*#__PURE__*/ function(Loader1) {
     _proto.load = function load(item, resourceManager) {
         var _this = this;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            var url = item.url;
+            var _resourceManager__virtualPathMap_item_url;
+            // @ts-ignore
+            var url = (_resourceManager__virtualPathMap_item_url = resourceManager._virtualPathMap[item.url]) != null ? _resourceManager__virtualPathMap_item_url : item.url;
             _this._registerFont(url, url).then(function() {
                 var font = new engineCore.Font(resourceManager.engine, url);
                 resolve(font);
@@ -6077,7 +6057,7 @@ var SpriteAtlasLoader = /*#__PURE__*/ function(Loader1) {
                     chainPromises[i].cancel();
                 }
             });
-            var configPromise = _this.request(item.url, _extends({}, item, {
+            var configPromise = _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "json"
             }));
             chainPromises.push(configPromise);
@@ -6160,7 +6140,7 @@ var SpriteLoader = /*#__PURE__*/ function(Loader1) {
     var _proto = SpriteLoader.prototype;
     _proto.load = function load(item, resourceManager) {
         var _this = this;
-        return this.request(item.url, _extends({}, item, {
+        return this.request(item.url, resourceManager, _extends({}, item, {
             type: "json"
         })).then(function(data) {
             return data.belongToAtlas ? _this._loadFromAtlas(resourceManager, data) : _this._loadFromTexture(resourceManager, data);
@@ -6238,7 +6218,7 @@ var Texture2DLoader = /*#__PURE__*/ function(Loader1) {
             var requestConfig = _extends({}, item, {
                 type: "image"
             });
-            _this.request(url, requestConfig).onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(image) {
+            _this.request(url, resourceManager, 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);
@@ -6316,7 +6296,7 @@ var TextureCubeLoader = /*#__PURE__*/ function(Loader1) {
                 type: "image"
             });
             Promise.all(urls.map(function(url) {
-                return _this.request(url, requestConfig);
+                return _this.request(url, resourceManager, requestConfig);
             })).then(function(images) {
                 var _images_ = images[0], width = _images_.width, height = _images_.height;
                 if (width !== height) {
@@ -6343,6 +6323,91 @@ TextureCubeLoader = __decorate([
     ])
 ], TextureCubeLoader);
 
+var _ShaderChunkLoader;
+var ShaderChunkLoader = (_ShaderChunkLoader = /*#__PURE__*/ function(Loader1) {
+    _inherits(ShaderChunkLoader1, Loader1);
+    function ShaderChunkLoader1() {
+        return Loader1.apply(this, arguments);
+    }
+    var _proto = ShaderChunkLoader1.prototype;
+    _proto.load = function load(item, resourceManager) {
+        var url = item.url;
+        return this.request(url, resourceManager, _extends({}, item, {
+            type: "text"
+        })).then(function(code) {
+            engineCore.ShaderFactory.registerInclude(url.substring(1), code);
+            return ShaderChunkLoader._loadChunksInCode(code, url, resourceManager);
+        });
+    };
+    /**
+   * @internal
+   */ ShaderChunkLoader1._loadChunksInCode = function _loadChunksInCode(code, basePath, resourceManager) {
+        var shaderChunkPaths = new Array();
+        var matches = code.matchAll(ShaderChunkLoader._shaderIncludeRegex);
+        for(var _iterator = _create_for_of_iterator_helper_loose(matches), _step; !(_step = _iterator()).done;){
+            var match = _step.value;
+            var chunkPath = engineCore.Utils.resolveAbsoluteUrl(basePath, match[1]);
+            if (!engineCore.ShaderLib[chunkPath.substring(1)]) {
+                shaderChunkPaths.push(chunkPath);
+            }
+        }
+        return Promise.all(shaderChunkPaths.map(function(chunkPath) {
+            return resourceManager.load({
+                type: "ShaderChunk",
+                url: chunkPath
+            });
+        }));
+    };
+    return ShaderChunkLoader1;
+}(engineCore.Loader), function() {
+    _ShaderChunkLoader._shaderIncludeRegex = /\s#include\s+"([./][^\\"]+)"/gm;
+}(), _ShaderChunkLoader);
+ShaderChunkLoader = __decorate([
+    engineCore.resourceLoader("ShaderChunk", [
+        "glsl"
+    ])
+], ShaderChunkLoader);
+
+var _ShaderLoader;
+var ShaderLoader = (_ShaderLoader = /*#__PURE__*/ function(Loader1) {
+    _inherits(ShaderLoader1, Loader1);
+    function ShaderLoader1() {
+        return Loader1.apply(this, arguments);
+    }
+    var _proto = ShaderLoader1.prototype;
+    _proto.load = function load(item, resourceManager) {
+        var _this = this;
+        var url = item.url;
+        return this.request(url, resourceManager, _extends({}, item, {
+            type: "text"
+        })).then(function(code) {
+            var builtinShader = _this._getBuiltinShader(code);
+            if (builtinShader) {
+                return engineCore.Shader.find(builtinShader);
+            }
+            return ShaderChunkLoader._loadChunksInCode(code, url, resourceManager).then(function() {
+                var shader = engineCore.Shader.create(code);
+                // @ts-ignore
+                shader._registerPath(url);
+                return shader;
+            });
+        });
+    };
+    _proto._getBuiltinShader = function _getBuiltinShader(code) {
+        var match = code.match(ShaderLoader._builtinRegex);
+        if (match && match[1]) return match[1];
+    };
+    return ShaderLoader1;
+}(engineCore.Loader), function() {
+    _ShaderLoader._builtinRegex = /^\s*\/\/\s*@builtin\s+(\w+)/;
+}(), _ShaderLoader);
+ShaderLoader = __decorate([
+    engineCore.resourceLoader(engineCore.AssetType.Shader, [
+        "gs",
+        "gsl"
+    ])
+], ShaderLoader);
+
 var SceneLoader = /*#__PURE__*/ function(Loader1) {
     _inherits(SceneLoader, Loader1);
     function SceneLoader() {
@@ -6353,7 +6418,7 @@ var SceneLoader = /*#__PURE__*/ function(Loader1) {
         var _this = this;
         var engine = resourceManager.engine;
         return new engineCore.AssetPromise(function(resolve, reject) {
-            _this.request(item.url, _extends({}, item, {
+            _this.request(item.url, resourceManager, _extends({}, item, {
                 type: "json"
             })).then(function(data) {
                 return SceneParser.parse(engine, data).then(function(scene) {