@galacean/engine-core 1.4.0-alpha.2 → 1.4.0-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +18 -13
- package/dist/main.js.map +1 -1
- package/dist/module.js +18 -13
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
- package/types/shader/Shader.d.ts +1 -1
package/dist/module.js
CHANGED
|
@@ -19492,8 +19492,8 @@ var MultiExecutor = /*#__PURE__*/ function() {
|
|
|
19492
19492
|
this._subAssetPromiseCallbacks = {};
|
|
19493
19493
|
this.//-----------------Editor temp solution-----------------
|
|
19494
19494
|
/** @internal */ _objectPool = Object.create(null);
|
|
19495
|
-
this./** @internal */
|
|
19496
|
-
this./** @internal */
|
|
19495
|
+
this./** @internal */ _idResourceMap = Object.create(null);
|
|
19496
|
+
this./** @internal */ _virtualPathResourceMap = Object.create(null);
|
|
19497
19497
|
}
|
|
19498
19498
|
var _proto = ResourceManager.prototype;
|
|
19499
19499
|
_proto.load = function load(assetInfo) {
|
|
@@ -19570,8 +19570,9 @@ var MultiExecutor = /*#__PURE__*/ function() {
|
|
|
19570
19570
|
/**
|
|
19571
19571
|
* @internal
|
|
19572
19572
|
*/ _proto._getRemoteUrl = function _getRemoteUrl(url) {
|
|
19573
|
-
var
|
|
19574
|
-
|
|
19573
|
+
var _this__virtualPathResourceMap_url;
|
|
19574
|
+
var _this__virtualPathResourceMap_url_path;
|
|
19575
|
+
return (_this__virtualPathResourceMap_url_path = (_this__virtualPathResourceMap_url = this._virtualPathResourceMap[url]) == null ? void 0 : _this__virtualPathResourceMap_url.path) != null ? _this__virtualPathResourceMap_url_path : url;
|
|
19575
19576
|
};
|
|
19576
19577
|
/**
|
|
19577
19578
|
* @internal
|
|
@@ -19587,9 +19588,9 @@ var MultiExecutor = /*#__PURE__*/ function() {
|
|
|
19587
19588
|
/**
|
|
19588
19589
|
* @internal
|
|
19589
19590
|
*/ _proto._onSubAssetSuccess = function _onSubAssetSuccess(assetBaseURL, assetSubPath, value) {
|
|
19590
|
-
var _this__subAssetPromiseCallbacks_remoteAssetBaseURL;
|
|
19591
|
-
var
|
|
19592
|
-
var remoteAssetBaseURL = (
|
|
19591
|
+
var _this__virtualPathResourceMap_assetBaseURL, _this__subAssetPromiseCallbacks_remoteAssetBaseURL;
|
|
19592
|
+
var _this__virtualPathResourceMap_assetBaseURL_path;
|
|
19593
|
+
var remoteAssetBaseURL = (_this__virtualPathResourceMap_assetBaseURL_path = (_this__virtualPathResourceMap_assetBaseURL = this._virtualPathResourceMap[assetBaseURL]) == null ? void 0 : _this__virtualPathResourceMap_assetBaseURL.path) != null ? _this__virtualPathResourceMap_assetBaseURL_path : assetBaseURL;
|
|
19593
19594
|
var subPromiseCallback = (_this__subAssetPromiseCallbacks_remoteAssetBaseURL = this._subAssetPromiseCallbacks[remoteAssetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_remoteAssetBaseURL[assetSubPath];
|
|
19594
19595
|
if (subPromiseCallback) {
|
|
19595
19596
|
subPromiseCallback.resolve(value);
|
|
@@ -19715,6 +19716,7 @@ var MultiExecutor = /*#__PURE__*/ function() {
|
|
|
19715
19716
|
};
|
|
19716
19717
|
_proto._loadSingleItem = function _loadSingleItem(itemOrURL) {
|
|
19717
19718
|
var _this = this;
|
|
19719
|
+
var _this__virtualPathResourceMap_assetBaseURL;
|
|
19718
19720
|
var item = this._assignDefaultOptions(typeof itemOrURL === "string" ? {
|
|
19719
19721
|
url: itemOrURL
|
|
19720
19722
|
} : itemOrURL);
|
|
@@ -19724,9 +19726,9 @@ var MultiExecutor = /*#__PURE__*/ function() {
|
|
|
19724
19726
|
// Parse url
|
|
19725
19727
|
var _this__parseURL = this._parseURL(url), assetBaseURL = _this__parseURL.assetBaseURL, queryPath = _this__parseURL.queryPath;
|
|
19726
19728
|
var paths = queryPath ? this._parseQueryPath(queryPath) : [];
|
|
19727
|
-
var
|
|
19729
|
+
var _this__virtualPathResourceMap_assetBaseURL_path;
|
|
19728
19730
|
// Get remote asset base url
|
|
19729
|
-
var remoteAssetBaseURL = (
|
|
19731
|
+
var remoteAssetBaseURL = (_this__virtualPathResourceMap_assetBaseURL_path = (_this__virtualPathResourceMap_assetBaseURL = this._virtualPathResourceMap[assetBaseURL]) == null ? void 0 : _this__virtualPathResourceMap_assetBaseURL.path) != null ? _this__virtualPathResourceMap_assetBaseURL_path : assetBaseURL;
|
|
19730
19732
|
// Check cache
|
|
19731
19733
|
var cacheObject = this._assetUrlPool[remoteAssetBaseURL];
|
|
19732
19734
|
if (cacheObject) {
|
|
@@ -19891,9 +19893,9 @@ var MultiExecutor = /*#__PURE__*/ function() {
|
|
|
19891
19893
|
if (obj) {
|
|
19892
19894
|
promise = Promise.resolve(obj);
|
|
19893
19895
|
} else {
|
|
19894
|
-
var resourceConfig = this.
|
|
19896
|
+
var resourceConfig = this._idResourceMap[refId];
|
|
19895
19897
|
if (!resourceConfig) {
|
|
19896
|
-
Logger.warn("refId:" + refId + " is not find in this.
|
|
19898
|
+
Logger.warn("refId:" + refId + " is not find in this._idResourceMap.");
|
|
19897
19899
|
return Promise.resolve(null);
|
|
19898
19900
|
}
|
|
19899
19901
|
var url = resourceConfig.virtualPath;
|
|
@@ -19915,8 +19917,11 @@ var MultiExecutor = /*#__PURE__*/ function() {
|
|
|
19915
19917
|
*/ _proto.initVirtualResources = function initVirtualResources(config) {
|
|
19916
19918
|
var _this = this;
|
|
19917
19919
|
config.forEach(function(element) {
|
|
19918
|
-
_this.
|
|
19919
|
-
_this.
|
|
19920
|
+
_this._virtualPathResourceMap[element.virtualPath] = element;
|
|
19921
|
+
_this._idResourceMap[element.id] = element;
|
|
19922
|
+
if (element.dependentAssetMap) {
|
|
19923
|
+
_this._virtualPathResourceMap[element.virtualPath].dependentAssetMap = element.dependentAssetMap;
|
|
19924
|
+
}
|
|
19920
19925
|
});
|
|
19921
19926
|
};
|
|
19922
19927
|
/**
|