@galacean/engine-core 2.0.0-alpha.38 → 2.0.0-alpha.39

package/dist/main.js

@@ -18619,7 +18619,7 @@ var MultiExecutor = /*#__PURE__*/ function() {
         this._graphicResourcePool = Object.create(null);
         this._contentRestorerPool = Object.create(null);
         this._subAssetPromiseCallbacks = {};
-        this.//-----------------Editor temp solution-----------------
+        this.// Virtual resource mapping
         /** @internal */ _objectPool = Object.create(null);
         this./** @internal */ _virtualPathResourceMap = Object.create(null);
     }
@@ -18733,21 +18733,6 @@ var MultiExecutor = /*#__PURE__*/ function() {
     };
     /**
    * @internal
-   */ _proto._onSubAssetFail = function _onSubAssetFail(assetBaseURL, assetSubPath, value) {
-        var _this__subAssetPromiseCallbacks_assetBaseURL;
-        var subPromiseCallback = (_this__subAssetPromiseCallbacks_assetBaseURL = this._subAssetPromiseCallbacks[assetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_assetBaseURL[assetSubPath];
-        if (subPromiseCallback) {
-            subPromiseCallback.reject(value);
-        } else {
-            var // Pending
-            _this__subAssetPromiseCallbacks, _assetBaseURL;
-            ((_this__subAssetPromiseCallbacks = this._subAssetPromiseCallbacks)[_assetBaseURL = assetBaseURL] || (_this__subAssetPromiseCallbacks[_assetBaseURL] = {}))[assetSubPath] = {
-                rejectedValue: value
-            };
-        }
-    };
-    /**
-   * @internal
    */ _proto._addAsset = function _addAsset(path, asset) {
         this._assetPool[asset.instanceId] = path;
         this._assetUrlPool[path] = asset;
@@ -18898,10 +18883,7 @@ var MultiExecutor = /*#__PURE__*/ function() {
         if (queryPath) {
             // Check whether load main asset
             var mainPromise = loadingPromises[remoteAssetBaseURL] || this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, subpackageName);
-            mainPromise.catch(function(e) {
-                _this._onSubAssetFail(remoteAssetBaseURL, queryPath, e);
-            });
-            return this._createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, queryPath);
+            return this._createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, queryPath, mainPromise);
         }
         return this._loadSubpackageAndMainAsset(loader, item, remoteAssetBaseURL, subpackageName);
     };
@@ -18926,30 +18908,33 @@ var MultiExecutor = /*#__PURE__*/ function() {
         });
         return promise;
     };
-    _proto._createSubAssetPromiseCallback = function _createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, assetSubPath) {
+    _proto._createSubAssetPromiseCallback = function _createSubAssetPromiseCallback(remoteAssetBaseURL, remoteAssetURL, assetSubPath, mainPromise) {
         var _this = this;
         var _this__subAssetPromiseCallbacks_remoteAssetBaseURL;
         var loadingPromises = this._loadingPromises;
         var subPromiseCallback = (_this__subAssetPromiseCallbacks_remoteAssetBaseURL = this._subAssetPromiseCallbacks[remoteAssetBaseURL]) == null ? void 0 : _this__subAssetPromiseCallbacks_remoteAssetBaseURL[assetSubPath];
         var resolvedValue = subPromiseCallback == null ? void 0 : subPromiseCallback.resolvedValue;
-        var rejectedValue = subPromiseCallback == null ? void 0 : subPromiseCallback.rejectedValue;
-        // Already resolved or rejected
-        if (resolvedValue || rejectedValue) {
-            return new AssetPromise(function(resolve, reject) {
-                if (resolvedValue) {
-                    resolve(resolvedValue);
-                } else if (rejectedValue) {
-                    reject(rejectedValue);
-                }
-            });
+        // Already resolved
+        if (resolvedValue) {
+            return AssetPromise.resolve(resolvedValue);
         }
         // Pending
-        var promise = new AssetPromise(function(resolve, reject) {
+        var promise = new AssetPromise(function(resolve, reject, setTaskCompleteProgress, setTaskDetailProgress) {
             var _this__subAssetPromiseCallbacks, _remoteAssetBaseURL;
             ((_this__subAssetPromiseCallbacks = _this._subAssetPromiseCallbacks)[_remoteAssetBaseURL = remoteAssetBaseURL] || (_this__subAssetPromiseCallbacks[_remoteAssetBaseURL] = {}))[assetSubPath] = {
                 resolve: resolve,
                 reject: reject
             };
+            // A loader may finish the main asset before its eager sub-asset notification reaches this callback.
+            // Always resolve from the completed main asset as the authoritative fallback so callback cleanup cannot
+            // strand a sub-asset request.
+            mainPromise.onProgress(setTaskCompleteProgress, setTaskDetailProgress).then(function(resource) {
+                try {
+                    resolve(_this._getResolveResource(resource, _this._parseQueryPath(assetSubPath)));
+                } catch (error) {
+                    reject(error);
+                }
+            }, reject);
         });
         loadingPromises[remoteAssetURL] = promise;
         promise.then(function() {
@@ -18973,7 +18958,10 @@ var MultiExecutor = /*#__PURE__*/ function() {
         if (paths) {
             for(var i = 0, n = paths.length; i < n; i++){
                 var path = paths[i];
-                subResource = subResource[path];
+                subResource = subResource == null ? void 0 : subResource[path];
+                if (subResource === undefined) {
+                    throw new Error("Sub-asset path does not exist: " + paths.join("."));
+                }
             }
         }
         return subResource;
@@ -19019,6 +19007,16 @@ var MultiExecutor = /*#__PURE__*/ function() {
         delete this._subAssetPromiseCallbacks[assetBaseURL];
     };
     /**
+   * Register virtual asset paths and their load descriptors.
+   * @remarks References inside runtime scenes and Prefabs can keep stable virtual paths while the backing URLs
+   * are generated dynamically, such as object URLs created from a resource package.
+   */ _proto.registerVirtualResources = function registerVirtualResources(resources) {
+        var _this = this;
+        resources.forEach(function(resource) {
+            _this._virtualPathResourceMap[resource.virtualPath] = resource;
+        });
+    };
+    /**
    * @internal
    * @beta Just for internal editor, not recommended for developers.
    */ _proto.getResourceByRef = function getResourceByRef(ref) {
@@ -19047,18 +19045,6 @@ var MultiExecutor = /*#__PURE__*/ function() {
     };
     /**
    * @internal
-   * @beta Just for internal editor, not recommended for developers.
-   */ _proto.initVirtualResources = function initVirtualResources(config) {
-        var _this = this;
-        config.forEach(function(element) {
-            _this._virtualPathResourceMap[element.virtualPath] = element;
-            if (element.dependentAssetMap) {
-                _this._virtualPathResourceMap[element.virtualPath].dependentAssetMap = element.dependentAssetMap;
-            }
-        });
-    };
-    /**
-   * @internal
    */ ResourceManager._addLoader = function _addLoader(type, loader, extNames) {
         this._loaders[type] = loader;
         for(var i = 0, len = extNames.length; i < len; i++){
@@ -27181,7 +27167,7 @@ var OverlayCamera = function OverlayCamera() {
     _inherits(Engine, EventDispatcher);
     function Engine(canvas, hardwareRenderer, configuration) {
         var _this;
-        _this = EventDispatcher.call(this) || this, /** @internal */ _this._renderingStatistics = new RenderingStatistics(), /** @internal */ _this._isDeviceLost = false, /** @internal */ _this._frameInProcess = false, /** @internal */ _this._pendingDestroyObjects = [], /** @internal */ _this._processingPendingDestroys = false, /** @internal */ _this._physicsInitialized = false, /* @internal */ _this._lastRenderState = new RenderState(), /* @internal */ _this._renderElementPool = new ClearableObjectPool(RenderElement), /* @internal */ _this._textRenderElementPool = new ClearableObjectPool(RenderElement), /* @internal */ _this._charRenderInfoPool = new ReturnableObjectPool(CharRenderInfo, 50), /* @internal */ _this._renderContext = new RenderContext(), /* @internal */ _this._renderCount = 0, /* @internal */ _this._shaderProgramMaps = [], /** @internal */ _this._fontMap = {}, /** @internal */ _this._macroCollection = new ShaderMacroCollection(), /** @internal */ _this._postProcessPassNeedRefresh = false, _this._settings = {}, _this._resourceManager = new ResourceManager(_this), _this._sceneManager = new SceneManager(_this), _this._vSyncCount = 1, _this._targetFrameRate = 60, _this._time = new Time(), _this._isPaused = true, _this._vSyncCounter = 1, _this._targetFrameInterval = 1000 / 60, _this._destroyed = false, _this._waitingDestroy = false, _this._waitingGC = false, _this._postProcessPasses = new Array(), _this._activePostProcessPasses = new Array(), _this._onCanvasResize = function() {
+        _this = EventDispatcher.call(this) || this, /** @internal */ _this._renderingStatistics = new RenderingStatistics(), /** @internal */ _this._isDeviceLost = false, /** @internal */ _this._frameInProcess = false, /** @internal */ _this._pendingDestroyObjects = [], /** @internal */ _this._processingPendingDestroys = false, /** @internal */ _this._physicsInitialized = false, /** @internal */ _this._lastRenderState = new RenderState(), /** @internal */ _this._renderElementPool = new ClearableObjectPool(RenderElement), /** @internal */ _this._textRenderElementPool = new ClearableObjectPool(RenderElement), /** @internal */ _this._charRenderInfoPool = new ReturnableObjectPool(CharRenderInfo, 50), /** @internal */ _this._renderContext = new RenderContext(), /** @internal */ _this._renderCount = 0, /** @internal */ _this._shaderProgramMaps = [], /** @internal */ _this._fontMap = {}, /** @internal */ _this._macroCollection = new ShaderMacroCollection(), /** @internal */ _this._postProcessPassNeedRefresh = false, _this._settings = {}, _this._resourceManager = new ResourceManager(_this), _this._sceneManager = new SceneManager(_this), _this._vSyncCount = 1, _this._targetFrameRate = 60, _this._time = new Time(), _this._isPaused = true, _this._vSyncCounter = 1, _this._targetFrameInterval = 1000 / 60, _this._destroyed = false, _this._waitingDestroy = false, _this._waitingGC = false, _this._postProcessPasses = new Array(), _this._activePostProcessPasses = new Array(), _this._onCanvasResize = function() {
             return _this._renderTargetPool.gc();
         }, _this._animate = function() {
             if (_this._vSyncCount) {
@@ -27262,6 +27248,7 @@ var OverlayCamera = function OverlayCamera() {
    * Update the engine loop manually. If you call engine.run(), you generally don't need to call this function.
    */ _proto.update = function update() {
         var _this_xrManager;
+        this._canvas._pumpPendingResolution();
         var time = this._time;
         time._update();
         var deltaTime = time.deltaTime;
@@ -27409,6 +27396,7 @@ var OverlayCamera = function OverlayCamera() {
         this._destroyed = true;
         this._waitingDestroy = false;
         this._canvas._sizeUpdateFlagManager.removeListener(this._onCanvasResize);
+        this._canvas._destroy();
         this._sceneManager._destroyAllScene();
         this._resourceManager._destroy();
         this.inputManager._destroy();
@@ -27705,40 +27693,57 @@ var OverlayCamera = function OverlayCamera() {
 /** @internal */ Engine._physicalObjectsMap = {};
 
 /**
- * Canvas.
+ * The canvas the engine renders to; owns the render-buffer resolution.
  */ var Canvas = /*#__PURE__*/ function() {
     function Canvas() {
-        /* @internal */ this._sizeUpdateFlagManager = new UpdateFlagManager();
+        /**
+   * @internal
+   */ this._sizeUpdateFlagManager = new UpdateFlagManager();
+        this._width = 0;
+        this._height = 0;
     }
+    var _proto = Canvas.prototype;
+    /**
+   * Lock the render buffer to an explicit resolution and stop following the display size.
+   * @param width - Render buffer width in pixels
+   * @param height - Render buffer height in pixels
+   *
+   * @throws
+   * Throw an error if width or height is not a positive finite number.
+   */ _proto.setResolution = function setResolution(width, height) {
+        if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) {
+            throw new Error("Canvas.setResolution: invalid size " + width + "x" + height);
+        }
+        this._exitAutoResolution();
+        this._setResolution(Math.round(width), Math.round(height));
+    };
+    _proto._setResolution = function _setResolution(width, height) {
+        if (this._width !== width || this._height !== height) {
+            this._width = width;
+            this._height = height;
+            this._onResolutionChanged(width, height);
+            this._sizeUpdateFlagManager.dispatch();
+        }
+    };
+    /**
+   * @internal
+   */ _proto._pumpPendingResolution = function _pumpPendingResolution() {};
+    _proto._exitAutoResolution = function _exitAutoResolution() {};
     _create_class(Canvas, [
         {
             key: "width",
             get: /**
-   * The width of the canvas.
+   * The width component of the canvas resolution, in pixels.
    */ function get() {
                 return this._width;
-            },
-            set: function set(value) {
-                if (this._width !== value) {
-                    this._width = value;
-                    this._onWidthChanged(value);
-                    this._sizeUpdateFlagManager.dispatch();
-                }
             }
         },
         {
             key: "height",
             get: /**
-   *The height of the canvas.
+   * The height component of the canvas resolution, in pixels.
    */ function get() {
                 return this._height;
-            },
-            set: function set(value) {
-                if (this._height !== value) {
-                    this._height = value;
-                    this._onHeightChange(value);
-                    this._sizeUpdateFlagManager.dispatch();
-                }
             }
         }
     ]);
@@ -27749,11 +27754,11 @@ var OverlayCamera = function OverlayCamera() {
  * The manager of the components.
  */ var ComponentsManager = /*#__PURE__*/ function() {
     function ComponentsManager() {
-        /* @internal */ this._cameraNeedSorting = false;
+        /** @internal */ this._cameraNeedSorting = false;
         /** @internal */ this._activeCameras = new DisorderedArray();
         /** @internal */ this._renderers = new DisorderedArray();
         /** @internal */ this._overlayCanvases = new DisorderedArray();
-        /* @internal */ this._overlayCanvasesSortingDirty = false;
+        /** @internal */ this._overlayCanvasesSortingDirty = false;
         /** @internal */ this._canvases = new DisorderedArray();
         // Script
         this._onStartScripts = new DisorderedArray();
@@ -28972,7 +28977,7 @@ AmbientOcclusion._enableMacro = ShaderMacro.getByName("SCENE_ENABLE_AMBIENT_OCCL
    * @remarks
    * Darkens areas where objects are close together to simulate natural light blocking,
    * such as corners, crevices, and contact points between surfaces.
-   */ _this.ambientOcclusion = new AmbientOcclusion(_this), /* @internal */ _this._lightManager = new LightManager(), /* @internal */ _this._componentsManager = new ComponentsManager(), /** @internal */ _this._maskManager = new MaskManager(), /** @internal */ _this._isActiveInEngine = false, /** @internal */ _this._rootEntities = [], _this._background = new Background(_this._engine), _this._shaderData = new ShaderData(ShaderDataGroup.Scene), _this._shadowCascades = ShadowCascadesMode.NoCascades, _this._fogMode = FogMode.None, _this._fogColor = new engineMath.Color(0.21404114048223255, 0.21404114048223255, 0.21404114048223255, 1.0), _this._fogStart = 0, _this._fogEnd = 300, _this._fogDensity = 0.01, _this._fogParams = new engineMath.Vector4(), _this._isActive = true, _this._enableTransparentShadow = false;
+   */ _this.ambientOcclusion = new AmbientOcclusion(_this), /** @internal */ _this._lightManager = new LightManager(), /** @internal */ _this._componentsManager = new ComponentsManager(), /** @internal */ _this._maskManager = new MaskManager(), /** @internal */ _this._isActiveInEngine = false, /** @internal */ _this._rootEntities = [], _this._background = new Background(_this._engine), _this._shaderData = new ShaderData(ShaderDataGroup.Scene), _this._shadowCascades = ShadowCascadesMode.NoCascades, _this._fogMode = FogMode.None, _this._fogColor = new engineMath.Color(0.21404114048223255, 0.21404114048223255, 0.21404114048223255, 1.0), _this._fogStart = 0, _this._fogEnd = 300, _this._fogDensity = 0.01, _this._fogParams = new engineMath.Vector4(), _this._isActive = true, _this._enableTransparentShadow = false;
         _this.name = name || "";
         var shaderData = _this.shaderData;
         shaderData._addReferCount(1);