@galacean/engine-core 1.3.16 → 1.3.17

package/dist/miniprogram.js

@@ -639,6 +639,11 @@ var Utils = /*#__PURE__*/ function() {
         if (Utils.isBase64Url(relativeUrl)) {
             return relativeUrl;
         }
+        if (!/^https?:/.test(baseUrl)) {
+            var fileSchema = "files://";
+            baseUrl = fileSchema + baseUrl;
+            return new engineMiniprogramAdapter.URL(relativeUrl, baseUrl).href.substring(fileSchema.length);
+        }
         return relativeUrl ? new engineMiniprogramAdapter.URL(relativeUrl, baseUrl).href : baseUrl;
     };
     /**
@@ -19063,6 +19068,7 @@ var ObjectPool = /*#__PURE__*/ function() {
     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";
@@ -19555,14 +19561,16 @@ var /** @internal */ PromiseState;
     /**
    * @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 // Pending
-            _this__subAssetPromiseCallbacks, _assetBaseURL;
-            ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
+            _this__subAssetPromiseCallbacks, _remoteAssetBaseURL;
+            ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_remoteAssetBaseURL = remoteAssetBaseURL] || (_this__subAssetPromiseCallbacks[_remoteAssetBaseURL] = {}))[assetSubPath] = {
                 resolvedValue: value
             };
         }
@@ -19684,33 +19692,34 @@ var /** @internal */ PromiseState;
         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) {
@@ -19728,37 +19737,37 @@ var /** @internal */ PromiseState;
         // 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
@@ -19773,17 +19782,17 @@ var /** @internal */ PromiseState;
         }
         // 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;
     };
@@ -19856,16 +19865,20 @@ var /** @internal */ PromiseState;
         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 engineMiniprogramAdapter.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) {
@@ -26473,8 +26486,13 @@ var MultiExecutor = /*#__PURE__*/ function() {
  */ var Loader = /*#__PURE__*/ function() {
     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.
    * @param key - class name

package/dist/module.js

@@ -634,6 +634,11 @@ var Utils = /*#__PURE__*/ function() {
         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;
     };
     /**
@@ -19058,6 +19063,7 @@ var ObjectPool = /*#__PURE__*/ function() {
     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";
@@ -19550,14 +19556,16 @@ var /** @internal */ PromiseState;
     /**
    * @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 // Pending
-            _this__subAssetPromiseCallbacks, _assetBaseURL;
-            ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
+            _this__subAssetPromiseCallbacks, _remoteAssetBaseURL;
+            ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_remoteAssetBaseURL = remoteAssetBaseURL] || (_this__subAssetPromiseCallbacks[_remoteAssetBaseURL] = {}))[assetSubPath] = {
                 resolvedValue: value
             };
         }
@@ -19679,33 +19687,34 @@ var /** @internal */ PromiseState;
         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) {
@@ -19723,37 +19732,37 @@ var /** @internal */ PromiseState;
         // 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
@@ -19768,17 +19777,17 @@ var /** @internal */ PromiseState;
         }
         // 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;
     };
@@ -19851,16 +19860,20 @@ var /** @internal */ PromiseState;
         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) {
@@ -26468,8 +26481,13 @@ var MultiExecutor = /*#__PURE__*/ function() {
  */ var Loader = /*#__PURE__*/ function() {
     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.
    * @param key - class name