@galacean/engine 1.3.16 → 1.3.17

package/dist/browser.js

@@ -5619,6 +5619,11 @@
             if (Utils.isBase64Url(relativeUrl)) {
                 return relativeUrl;
             }
+            if (!/^https?:/.test(baseUrl)) {
+                var fileSchema = "files://";
+                baseUrl = fileSchema + baseUrl;
+                return new URL(relativeUrl, baseUrl).href.substring(fileSchema.length);
+            }
             return relativeUrl ? new URL(relativeUrl, baseUrl).href : baseUrl;
         };
         /**
@@ -23799,6 +23804,7 @@
         AssetType[/** 2D Texture. */ "Texture2D"] = "Texture2D";
         AssetType[/** Cube Texture. */ "TextureCube"] = "TextureCube";
         AssetType[/** Material. */ "Material"] = "Material";
+        AssetType[/** Shader. */ "Shader"] = "Shader";
         AssetType[/** Mesh. */ "Mesh"] = "Mesh";
         AssetType[/** AnimationClip. */ "AnimationClip"] = "AnimationClip";
         AssetType[/** AnimatorController. */ "AnimatorController"] = "AnimatorController";
@@ -24286,13 +24292,15 @@
         /**
        * @internal
        */ _proto._onSubAssetSuccess = function _onSubAssetSuccess(assetBaseURL, assetSubPath, value) {
-            var _this__subAssetPromiseCallbacks_assetBaseURL;
-            var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
+            var _this__subAssetPromiseCallbacks_remoteAssetBaseURL;
+            var _this__virtualPathMap_assetBaseURL;
+            var remoteAssetBaseURL = (_this__virtualPathMap_assetBaseURL = this._virtualPathMap[assetBaseURL]) != null ? _this__virtualPathMap_assetBaseURL : assetBaseURL;
+            var subPromiseCallback = (_this__subAssetPromiseCallbacks_remoteAssetBaseURL = this._subAssetPromiseCallbacks[remoteAssetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_remoteAssetBaseURL[assetSubPath];
             if (subPromiseCallback) {
                 subPromiseCallback.resolve(value);
             } else {
-                var _this__subAssetPromiseCallbacks, _assetBaseURL;
-                ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
+                var _this__subAssetPromiseCallbacks, _remoteAssetBaseURL;
+                ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_remoteAssetBaseURL = remoteAssetBaseURL] || (_this__subAssetPromiseCallbacks[_remoteAssetBaseURL] = {}))[assetSubPath] = {
                     resolvedValue: value
                 };
             }
@@ -24413,33 +24421,34 @@
             var item = this._assignDefaultOptions(typeof itemOrURL === "string" ? {
                 url: itemOrURL
             } : itemOrURL);
-            // Check url mapping
-            var itemURL = item.url;
-            var url = this._virtualPathMap[itemURL] ? this._virtualPathMap[itemURL] : itemURL;
+            var url = item.url;
             // Not absolute and base url is set
             if (!Utils.isAbsoluteUrl(url) && this.baseUrl) url = Utils.resolveAbsoluteUrl(this.baseUrl, url);
             // Parse url
             var _this__parseURL = this._parseURL(url), assetBaseURL = _this__parseURL.assetBaseURL, queryPath = _this__parseURL.queryPath;
             var paths = queryPath ? this._parseQueryPath(queryPath) : [];
+            var _this__virtualPathMap_assetBaseURL;
+            // Get remote asset base url
+            var remoteAssetBaseURL = (_this__virtualPathMap_assetBaseURL = this._virtualPathMap[assetBaseURL]) != null ? _this__virtualPathMap_assetBaseURL : assetBaseURL;
             // Check cache
-            var cacheObject = this._assetUrlPool[assetBaseURL];
+            var cacheObject = this._assetUrlPool[remoteAssetBaseURL];
             if (cacheObject) {
                 return new AssetPromise(function(resolve) {
                     resolve(_this._getResolveResource(cacheObject, paths));
                 });
             }
             // Get asset url
-            var assetURL = assetBaseURL;
+            var remoteAssetURL = remoteAssetBaseURL;
             if (queryPath) {
-                assetURL += "?q=" + paths.shift();
+                remoteAssetURL += "?q=" + paths.shift();
                 var index;
                 while(index = paths.shift()){
-                    assetURL += "[" + index + "]";
+                    remoteAssetURL += "[" + index + "]";
                 }
             }
             // Check is loading
             var loadingPromises = this._loadingPromises;
-            var loadingPromise = loadingPromises[assetURL];
+            var loadingPromise = loadingPromises[remoteAssetURL];
             if (loadingPromise) {
                 return new AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
                     loadingPromise.onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(resource) {
@@ -24457,37 +24466,37 @@
             // Check sub asset
             if (queryPath) {
                 // Check whether load main asset
-                var mainPromise = loadingPromises[assetBaseURL] || this._loadMainAsset(loader, item, assetBaseURL);
+                var mainPromise = loadingPromises[remoteAssetBaseURL] || this._loadMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL);
                 mainPromise.catch(function(e) {
-                    _this._onSubAssetFail(assetBaseURL, queryPath, e);
+                    _this._onSubAssetFail(remoteAssetBaseURL, queryPath, e);
                 });
-                return this._createSubAssetPromiseCallback(assetBaseURL, assetURL, queryPath);
+                return this._createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, queryPath);
             }
-            return this._loadMainAsset(loader, item, assetBaseURL);
+            return this._loadMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL);
         };
-        _proto._loadMainAsset = function _loadMainAsset(loader, item, assetBaseURL) {
+        _proto._loadMainAsset = function _loadMainAsset(loader, item, remoteAssetBaseURL, assetBaseURL) {
             var _this = this;
             item.url = assetBaseURL;
             var loadingPromises = this._loadingPromises;
             var promise = loader.load(item, this);
-            loadingPromises[assetBaseURL] = promise;
+            loadingPromises[remoteAssetBaseURL] = promise;
             promise.then(function(resource) {
                 if (loader.useCache) {
-                    _this._addAsset(assetBaseURL, resource);
+                    _this._addAsset(remoteAssetBaseURL, resource);
                 }
-                delete loadingPromises[assetBaseURL];
-                _this._releaseSubAssetPromiseCallback(assetBaseURL);
+                delete loadingPromises[remoteAssetBaseURL];
+                _this._releaseSubAssetPromiseCallback(remoteAssetBaseURL);
             }, function() {
-                delete loadingPromises[assetBaseURL];
-                _this._releaseSubAssetPromiseCallback(assetBaseURL);
+                delete loadingPromises[remoteAssetBaseURL];
+                _this._releaseSubAssetPromiseCallback(remoteAssetBaseURL);
             });
             return promise;
         };
-        _proto._createSubAssetPromiseCallback = function _createSubAssetPromiseCallback(assetBaseURL, assetURL, assetSubPath) {
+        _proto._createSubAssetPromiseCallback = function _createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, assetSubPath) {
             var _this = this;
-            var _this__subAssetPromiseCallbacks_assetBaseURL, _subPromiseCallback, _subPromiseCallback1;
+            var _this__subAssetPromiseCallbacks_remoteAssetBaseURL, _subPromiseCallback, _subPromiseCallback1;
             var loadingPromises = this._loadingPromises;
-            var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
+            var subPromiseCallback = (_this__subAssetPromiseCallbacks_remoteAssetBaseURL = this._subAssetPromiseCallbacks[remoteAssetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_remoteAssetBaseURL[assetSubPath];
             var resolvedValue = (_subPromiseCallback = subPromiseCallback) == null ? void 0 : _subPromiseCallback.resolvedValue;
             var rejectedValue = (_subPromiseCallback1 = subPromiseCallback) == null ? void 0 : _subPromiseCallback1.rejectedValue;
             // Already resolved or rejected
@@ -24502,17 +24511,17 @@
             }
             // Pending
             var promise = new AssetPromise(function(resolve, reject) {
-                var _this__subAssetPromiseCallbacks, _assetBaseURL;
-                ((_this__subAssetPromiseCallbacks = _this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
+                var _this__subAssetPromiseCallbacks, _remoteAssetBaseURL;
+                ((_this__subAssetPromiseCallbacks = _this._subAssetPromiseCallbacks)[_remoteAssetBaseURL = remoteAssetBaseURL] || (_this__subAssetPromiseCallbacks[_remoteAssetBaseURL] = {}))[assetSubPath] = {
                     resolve: resolve,
                     reject: reject
                 };
             });
-            loadingPromises[assetURL] = promise;
+            loadingPromises[remoteAssetURL] = promise;
             promise.then(function() {
-                delete loadingPromises[assetURL];
+                delete loadingPromises[remoteAssetURL];
             }, function() {
-                return delete loadingPromises[assetURL];
+                return delete loadingPromises[remoteAssetURL];
             });
             return promise;
         };
@@ -24585,16 +24594,20 @@
             if (obj) {
                 promise = Promise.resolve(obj);
             } else {
-                var _this__editorResourceConfig_refId;
-                var url = (_this__editorResourceConfig_refId = this._editorResourceConfig[refId]) == null ? void 0 : _this__editorResourceConfig_refId.path;
-                if (!url) {
+                var resourceConfig = this._editorResourceConfig[refId];
+                if (!resourceConfig) {
                     Logger.warn("refId:" + refId + " is not find in this._editorResourceConfig.");
                     return Promise.resolve(null);
                 }
-                url = key ? "" + url + (url.indexOf("?") > -1 ? "&" : "?") + "q=" + key : url;
+                var remoteUrl = resourceConfig.path;
+                var queryPath = new URL(remoteUrl).search;
+                var url = resourceConfig.virtualPath + queryPath;
+                if (key) {
+                    url += (url.indexOf("?") > -1 ? "&" : "?") + "q=" + key;
+                }
                 promise = this.load({
                     url: url,
-                    type: this._editorResourceConfig[refId].type
+                    type: resourceConfig.type
                 });
             }
             return promise.then(function(item) {
@@ -31098,7 +31111,12 @@
      */ var Loader = /*#__PURE__*/ function() {
         var Loader = function Loader(useCache) {
             this.useCache = useCache;
-            this.request = request;
+        };
+        var _proto = Loader.prototype;
+        _proto.request = function request1(url, resourceManager, config) {
+            var _resourceManager__virtualPathMap_url;
+            var remoteUrl = (_resourceManager__virtualPathMap_url = resourceManager._virtualPathMap[url]) != null ? _resourceManager__virtualPathMap_url : url;
+            return request(remoteUrl, config);
         };
         /**
        * Register a class with a string name for serialization and deserialization.
@@ -42269,6 +42287,17 @@
     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";
@@ -42642,31 +42671,6 @@
         };
         return SceneParser;
     }(HierarchyParser);
-    exports.MeshLoader = /*#__PURE__*/ function(Loader1) {
-        var MeshLoader = function MeshLoader() {
-            return Loader1.apply(this, arguments);
-        };
-        _inherits(MeshLoader, Loader1);
-        var _proto = MeshLoader.prototype;
-        _proto.load = function load(item, resourceManager) {
-            var _this = this;
-            return new 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;
-    }(Loader);
-    exports.MeshLoader = __decorate([
-        resourceLoader("Mesh", [
-            "prefab"
-        ], true)
-    ], exports.MeshLoader);
     exports.EditorTextureLoader = /*#__PURE__*/ function(Loader1) {
         var EditorTextureLoader = function EditorTextureLoader() {
             return Loader1.apply(this, arguments);
@@ -42676,7 +42680,7 @@
         _proto.load = function load(item, resourceManager) {
             var _this = this;
             return new 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) {
@@ -42714,7 +42718,7 @@
         _proto.load = function load(item, resourceManager) {
             var _this = this;
             return new 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) {
@@ -42765,7 +42769,7 @@
         _proto.load = function load(item, resourceManager) {
             var _this = this;
             return new 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 AnimatorController(resourceManager.engine);
@@ -42869,7 +42873,7 @@
         };
         _inherits(BufferLoader, Loader1);
         var _proto = BufferLoader.prototype;
-        _proto.load = function load(item) {
+        _proto.load = function load(item, resourceManager) {
             var url = item.url;
             if (isBase64(url)) {
                 return new AssetPromise(function(resolve) {
@@ -42880,7 +42884,7 @@
                     resolve(result.buffer);
                 });
             }
-            return this.request(url, _extends({}, item, {
+            return this.request(url, resourceManager, _extends({}, item, {
                 type: "arraybuffer"
             }));
         };
@@ -42901,7 +42905,7 @@
         _proto.load = function load(item, resourceManager) {
             var _this = this;
             return new AssetPromise(function(resolve, reject) {
-                _this.request(item.url, _extends({}, item, {
+                _this.request(item.url, resourceManager, _extends({}, item, {
                     type: "arraybuffer"
                 })).then(function(arraybuffer) {
                     var _this;
@@ -42977,7 +42981,7 @@
         _proto.load = function load(item, resourceManager) {
             var _this = this;
             return new 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;
@@ -44621,7 +44625,7 @@
        */ _proto.load = function load(item, resourceManager) {
             var _this = this;
             return new 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) {
@@ -45156,8 +45160,11 @@
             var requestConfig = {
                 type: "arraybuffer"
             };
-            return 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 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;
@@ -45383,11 +45390,14 @@
         _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 = Utils.resolveAbsoluteUrl(url, bufferInfo.uri);
+            var absoluteUrl = Utils.resolveAbsoluteUrl(remoteUrl, bufferInfo.uri);
             restoreBufferRequests.push(new BufferRequestInfo(absoluteUrl, requestConfig));
             var promise = request(absoluteUrl, requestConfig).onProgress(undefined, context._onTaskDetail);
             context._addTaskCompletePromise(promise);
@@ -46420,9 +46430,8 @@
             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));
@@ -46487,7 +46496,7 @@
             var _this = this;
             var engine = resourceManager.engine;
             return new 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);
@@ -46513,7 +46522,7 @@
             var _this = this;
             return new 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);
@@ -46827,8 +46836,8 @@
         };
         _inherits(JSONLoader, Loader1);
         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"
             }));
         };
@@ -47032,7 +47041,7 @@
             var _this = this;
             return new 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) {
@@ -47067,7 +47076,7 @@
         _proto.load = function load(item, resourceManager) {
             var _this = this;
             return new 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);
@@ -47109,62 +47118,75 @@
         _proto.load = function load(item, resourceManager) {
             var _this = this;
             return new 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 _loop(key) {
-                        var _shaderData_key = shaderData[key], type = _shaderData_key.type, value = _shaderData_key.value;
-                        switch(type){
-                            case "Vector2":
-                                materialShaderData.setVector2(key, new Vector2(value.x, value.y));
-                                break;
-                            case "Vector3":
-                                materialShaderData.setVector3(key, new Vector3(value.x, value.y, value.z));
-                                break;
-                            case "Vector4":
-                                materialShaderData.setVector4(key, new Vector4(value.x, value.y, value.z, value.w));
-                                break;
-                            case "Color":
-                                materialShaderData.setColor(key, new Color(value.r, value.g, value.b, value.a));
-                                break;
-                            case "Float":
-                                materialShaderData.setFloat(key, value);
-                                break;
-                            case "Texture":
-                                texturePromises.push(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 Material(engine, 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 = 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 _loop(key) {
+                var _shaderData_key = shaderData[key], type = _shaderData_key.type, value = _shaderData_key.value;
+                switch(type){
+                    case exports.MaterialLoaderType.Vector2:
+                        materialShaderData.setVector2(key, new Vector2(value.x, value.y));
+                        break;
+                    case exports.MaterialLoaderType.Vector3:
+                        materialShaderData.setVector3(key, new Vector3(value.x, value.y, value.z));
+                        break;
+                    case exports.MaterialLoaderType.Vector4:
+                        materialShaderData.setVector4(key, new Vector4(value.x, value.y, value.z, value.w));
+                        break;
+                    case exports.MaterialLoaderType.Color:
+                        materialShaderData.setColor(key, new 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(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 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;
     }(Loader);
     MaterialLoader = __decorate([
@@ -47172,40 +47194,15 @@
             "json"
         ])
     ], MaterialLoader);
-    var MeshLoader = /*#__PURE__*/ function(Loader1) {
-        var MeshLoader = function MeshLoader() {
-            return Loader1.apply(this, arguments);
-        };
-        _inherits(MeshLoader, Loader1);
-        var _proto = MeshLoader.prototype;
-        _proto.load = function load(item, resourceManager) {
-            var _this = this;
-            return new 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;
-    }(Loader);
-    MeshLoader = __decorate([
-        resourceLoader(exports.AssetType.Mesh, [
-            "mesh"
-        ])
-    ], MeshLoader);
     var PrimitiveMeshLoader = /*#__PURE__*/ function(Loader1) {
         var PrimitiveMeshLoader = function PrimitiveMeshLoader() {
             return Loader1.apply(this, arguments);
         };
         _inherits(PrimitiveMeshLoader, Loader1);
         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){
@@ -47253,7 +47250,7 @@
             var _this = this;
             var engine = resourceManager.engine;
             return new AssetPromise(function(resolve, reject) {
-                _this.request(item.url, _extends({}, item, {
+                _this.request(item.url, resourceManager, _extends({}, item, {
                     type: "json"
                 })).then(function(data) {
                     // @ts-ignore
@@ -47284,7 +47281,9 @@
         _proto.load = function load(item, resourceManager) {
             var _this = this;
             return new 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 Font(resourceManager.engine, url);
                     resolve(font);
@@ -47343,7 +47342,7 @@
                         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);
@@ -47425,7 +47424,7 @@
         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);
@@ -47501,7 +47500,7 @@
                 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 Texture2D(resourceManager.engine, image.width, image.height, format, mipmap);
@@ -47577,7 +47576,7 @@
                     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) {
@@ -47603,6 +47602,89 @@
             ""
         ])
     ], TextureCubeLoader);
+    var _ShaderChunkLoader;
+    var ShaderChunkLoader = (_ShaderChunkLoader = /*#__PURE__*/ function(Loader1) {
+        var ShaderChunkLoader1 = function ShaderChunkLoader1() {
+            return Loader1.apply(this, arguments);
+        };
+        _inherits(ShaderChunkLoader1, Loader1);
+        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) {
+                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 = Utils.resolveAbsoluteUrl(basePath, match[1]);
+                if (!ShaderLib[chunkPath.substring(1)]) {
+                    shaderChunkPaths.push(chunkPath);
+                }
+            }
+            return Promise.all(shaderChunkPaths.map(function(chunkPath) {
+                return resourceManager.load({
+                    type: "ShaderChunk",
+                    url: chunkPath
+                });
+            }));
+        };
+        return ShaderChunkLoader1;
+    }(Loader), function() {
+        _ShaderChunkLoader._shaderIncludeRegex = /\s#include\s+"([./][^\\"]+)"/gm;
+    }(), _ShaderChunkLoader);
+    ShaderChunkLoader = __decorate([
+        resourceLoader("ShaderChunk", [
+            "glsl"
+        ])
+    ], ShaderChunkLoader);
+    var _ShaderLoader;
+    var ShaderLoader = (_ShaderLoader = /*#__PURE__*/ function(Loader1) {
+        var ShaderLoader1 = function ShaderLoader1() {
+            return Loader1.apply(this, arguments);
+        };
+        _inherits(ShaderLoader1, Loader1);
+        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 Shader.find(builtinShader);
+                }
+                return ShaderChunkLoader._loadChunksInCode(code, url, resourceManager).then(function() {
+                    var shader = 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;
+    }(Loader), function() {
+        _ShaderLoader._builtinRegex = /^\s*\/\/\s*@builtin\s+(\w+)/;
+    }(), _ShaderLoader);
+    ShaderLoader = __decorate([
+        resourceLoader(exports.AssetType.Shader, [
+            "gs",
+            "gsl"
+        ])
+    ], ShaderLoader);
     var SceneLoader = /*#__PURE__*/ function(Loader1) {
         var SceneLoader = function SceneLoader() {
             return Loader1.apply(this, arguments);
@@ -47613,7 +47695,7 @@
             var _this = this;
             var engine = resourceManager.engine;
             return new 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) {
@@ -48162,7 +48244,7 @@
     ], EXT_texture_webp);
 
     //@ts-ignore
-    var version = "1.3.16";
+    var version = "1.3.17";
     console.log("Galacean engine version: " + version);
     for(var key in CoreObjects){
         Loader.registerClass(key, CoreObjects[key]);