@galacean/engine-core 2.0.0-alpha.5 → 2.0.0-alpha.6

package/dist/main.js

@@ -24148,7 +24148,6 @@ PrimitiveChunk.subMeshPool = new ReturnableObjectPool(SubMesh, 10);
     /** Sprite Atlas. */ AssetType["SpriteAtlas"] = "SpriteAtlas";
     /** Ambient light. */ AssetType["Env"] = "Environment";
     /** Scene. */ AssetType["Scene"] = "Scene";
-    /** HDR to cube. */ AssetType["HDR"] = "HDR";
     /** Font. */ AssetType["Font"] = "Font";
     /** Source Font, include ttf, otf and woff. */ AssetType["SourceFont"] = "SourceFont";
     /** AudioClip, include ogg, wav and mp3. */ AssetType["Audio"] = "Audio";
@@ -24568,7 +24567,6 @@ var MultiExecutor = /*#__PURE__*/ function() {
         this._subAssetPromiseCallbacks = {};
         this.//-----------------Editor temp solution-----------------
         /** @internal */ _objectPool = Object.create(null);
-        this./** @internal */ _idResourceMap = Object.create(null);
         this./** @internal */ _virtualPathResourceMap = Object.create(null);
     }
     var _proto = ResourceManager.prototype;
@@ -24969,30 +24967,29 @@ var MultiExecutor = /*#__PURE__*/ function() {
    * @internal
    * @beta Just for internal editor, not recommended for developers.
    */ _proto.getResourceByRef = function getResourceByRef(ref) {
-        var refId = ref.refId, key = ref.key, isClone = ref.isClone;
-        var obj = this._objectPool[refId];
-        var promise;
-        if (obj) {
-            promise = AssetPromise.resolve(obj);
-        } else {
-            var resourceConfig = this._idResourceMap[refId];
-            if (!resourceConfig) {
-                Logger.warn("refId:" + refId + " is not find in this._idResourceMap.");
-                return AssetPromise.resolve(null);
-            }
-            var url = resourceConfig.virtualPath;
-            if (key) {
-                url += "?q=" + key;
-            }
-            promise = this.load({
-                url: url,
-                type: resourceConfig.type,
-                params: resourceConfig.params
-            });
-        }
-        return promise.then(function(item) {
-            return isClone ? item.clone() : item;
+        var url = ref.url, key = ref.key, isClone = ref.isClone;
+        if (!url) {
+            Logger.warn("ResourceManager.getResourceByRef: url is empty.");
+            return AssetPromise.resolve(null);
+        }
+        var cached = this._objectPool[url];
+        if (cached) {
+            return AssetPromise.resolve(isClone ? cached.clone() : cached);
+        }
+        var mapped = this._virtualPathResourceMap[url];
+        if (!mapped) {
+            Logger.warn('ResourceManager.getResourceByRef: url "' + url + '" not found in virtualPathResourceMap.');
+            return AssetPromise.resolve(null);
+        }
+        var loadUrl = key ? url + "?q=" + key : url;
+        var promise = this.load({
+            url: loadUrl,
+            type: mapped.type,
+            params: mapped.params
         });
+        return isClone ? promise.then(function(item) {
+            return item.clone();
+        }) : promise;
     };
     /**
    * @internal
@@ -25001,7 +24998,6 @@ var MultiExecutor = /*#__PURE__*/ function() {
         var _this = this;
         config.forEach(function(element) {
             _this._virtualPathResourceMap[element.virtualPath] = element;
-            _this._idResourceMap[element.id] = element;
             if (element.dependentAssetMap) {
                 _this._virtualPathResourceMap[element.virtualPath].dependentAssetMap = element.dependentAssetMap;
             }