@onerjs/core 8.54.3 → 8.54.5

package/XR/webXRWebGPURenderTargetTextureProvider.js

@@ -1,4 +1,5 @@
 
+import { Color4 } from "../Maths/math.color.pure.js";
 import { WebXRLayerRenderTargetTexture } from "./webXRLayerRenderTargetTexture.js";
 import { WebXRLayerRenderTargetTextureProvider } from "./webXRRenderTargetTextureProvider.js";
 /**
@@ -37,6 +38,11 @@ function GetBabylonDepthFormat(format) {
  * @internal
  */
 export class WebXRWebGPURenderTargetTextureProvider extends WebXRLayerRenderTargetTextureProvider {
+    constructor(_xrSessionManager, layerWrapper) {
+        super(_xrSessionManager.scene, layerWrapper);
+        this._xrSessionManager = _xrSessionManager;
+        this._transparentClearColor = new Color4(0, 0, 0, 0);
+    }
     get _webgpuEngine() {
         return this._engine;
     }
@@ -66,6 +72,10 @@ export class WebXRWebGPURenderTargetTextureProvider extends WebXRLayerRenderTarg
         }
         const renderTargetTexture = new WebXRLayerRenderTargetTexture("XR renderTargetTexture", { width, height }, this._scene);
         renderTargetTexture.renderTarget._samples = renderTargetTexture.samples;
+        // The projection-layer texture is presented directly by the XR compositor (top-left origin, never
+        // re-sampled by Babylon), so opt this target out of the engine's render-target Y-flip / winding
+        // compensation and render it upright, matching the WebXR/WebGPU spec's plain render pass.
+        renderTargetTexture.renderTarget._disableEngineYFlip = true;
         return renderTargetTexture;
     }
     /**
@@ -99,28 +109,46 @@ export class WebXRWebGPURenderTargetTextureProvider extends WebXRLayerRenderTarg
      * `camera.isRightCamera`, so this observer clears both eyes' targets. WebGL providers never attach it,
      * so the WebGL path is unchanged.
      *
-     * The observer mirrors the clear semantics of `Scene._clearFrameBuffer` (minus the right-eye skip): it
-     * only clears when the scene has `autoClear` enabled, clears color at most once per frame (guarded by
-     * `RenderTargetTexture._cleared`, which the scene resets per frame in `_checkCameraRenderTarget`), always
-     * clears depth+stencil, and honors `skipInitialClear`. This keeps the "clear once per RTT per frame"
-     * contract instead of clearing color on every notification.
+     * Color is cleared at most once per ENGINE FRAME, not once per `Scene.render`. The distinction matters:
+     * more than one scene can render the same XR camera within a single XR frame. `UtilityLayerRenderer`
+     * (used by controller pointer selection and near interaction) renders a second scene through the same
+     * rig cameras, and every `Scene.render` resets `RenderTargetTexture._cleared` for those cameras' targets
+     * (`Scene._checkCameraRenderTarget`), so a `_cleared`-based guard is defeated and each eye is re-cleared
+     * after it was drawn — presenting a clear-colored frame with the geometry gone. `AbstractEngine.frameId`
+     * only advances in `endFrame`, once per XR frame, so unlike `_cleared` it cannot be reset by another
+     * scene rendering the same camera.
+     *
+     * In immersive AR, color is cleared to transparent when `WebXRExperienceHelper` disables
+     * `Scene.autoClear`. WebGL XR framebuffers are cleared to transparent by the user agent, but WebGPU render
+     * passes require the application to request that clear explicitly. Skipping it leaves pixels from prior
+     * frames in passthrough regions, producing trails behind moving objects.
+     *
+     * Depth and stencil are still cleared on every notification, matching the previous behavior and the
+     * expectations of overlay scenes that draw on top of the main scene.
      * @param renderTargetTexture the per-eye render target to clear each frame
      */
     _attachPerEyeClearObserver(renderTargetTexture) {
+        let lastColorClearedFrameId = -1;
         renderTargetTexture.onClearObservable.add((engine) => {
             // Honor skipInitialClear so this observer preserves the default clear semantics it replaces.
             if (renderTargetTexture.skipInitialClear) {
                 return;
             }
             const scene = renderTargetTexture.getScene();
+            const isImmersiveAR = this._xrSessionManager.sessionMode === "immersive-ar";
             // When autoClear is disabled the scene does not clear render targets; match that so this observer
-            // does not force a clear the user opted out of.
-            if (scene && !scene.autoClear) {
+            // does not force a clear the user opted out of. Immersive AR is the exception: the experience
+            // helper disables autoClear because WebGL XR is cleared by the user agent, while WebGPU is not.
+            if (scene && !scene.autoClear && !isImmersiveAR) {
                 return;
             }
-            // Clear color only once per frame (!_cleared), always clear depth+stencil, then mark the target
-            // cleared for this frame so a second notification in the same frame does not re-clear color.
-            engine.clear(renderTargetTexture.clearColor ?? scene?.clearColor ?? null, !renderTargetTexture._cleared, true, true);
+            const clearColor = engine.frameId !== lastColorClearedFrameId;
+            const color = isImmersiveAR && scene && !scene.autoClear ? this._transparentClearColor : (renderTargetTexture.clearColor ?? scene?.clearColor ?? null);
+            engine.clear(color, clearColor, true, true);
+            if (clearColor) {
+                lastColorClearedFrameId = engine.frameId;
+            }
+            // Kept in sync so anything else reading the flag still sees this target as cleared this frame.
             renderTargetTexture._cleared = true;
         });
     }

package/XR/webXRWebGPURenderTargetTextureProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"webXRWebGPURenderTargetTextureProvider.js","sourceRoot":"","sources":["../../../../dev/core/src/XR/webXRWebGPURenderTargetTextureProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAKjD,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,qCAAqC,EAAE,MAAM,oCAAoC,CAAC;AAE3F;;;;;;;;GAQG;AACH,SAAS,qBAAqB,CAAC,MAAwB;IACnD,QAAQ,MAAM,EAAE,CAAC;QACb,KAAK,cAAc;YACf,OAAO,SAAS,CAAC,qBAAqB,CAAC;QAC3C,KAAK,aAAa;YACd,OAAO,SAAS,CAAC,qBAAqB,CAAC;QAC3C,KAAK,sBAAsB;YACvB,OAAO,SAAS,CAAC,8BAA8B,CAAC;QACpD,KAAK,cAAc;YACf,OAAO,SAAS,CAAC,2BAA2B,CAAC;QACjD,KAAK,uBAAuB;YACxB,OAAO,SAAS,CAAC,mCAAmC,CAAC;QACzD,KAAK,UAAU;YACX,OAAO,SAAS,CAAC,sBAAsB,CAAC;QAC5C;YACI,uFAAuF;YACvF,OAAO,SAAS,CAAC,8BAA8B,CAAC;IACxD,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,OAAgB,sCAAuC,SAAQ,qCAAqC;IACtG,IAAY,aAAa;QACrB,OAAO,IAAI,CAAC,OAAuB,CAAC;IACxC,CAAC;IAEO,iBAAiB,CAAC,OAAmB;QACzC,OAAO,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAEO,iBAAiB,CAAC,OAAmB,EAAE,kBAAoC;QAC/E,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACtE,kGAAkG;QAClG,yFAAyF;QACzF,6FAA6F;QAC7F,eAAe,CAAC,MAAM,GAAG,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QACnE,OAAO,eAAe,CAAC;IAC3B,CAAC;IAED;;;;;;;;OAQG;IACgB,+BAA+B,CAAC,KAAa,EAAE,MAAc,EAAE,SAAkB;QAChG,IAAI,SAAS,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC,+BAA+B,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,mBAAmB,GAAG,IAAI,6BAA6B,CAAC,wBAAwB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACxH,mBAAmB,CAAC,YAAa,CAAC,QAAQ,GAAG,mBAAmB,CAAC,OAAO,CAAC;QACzE,OAAO,mBAAmB,CAAC;IAC/B,CAAC;IAED;;;;;;;;;;OAUG;IACO,yCAAyC,CAC/C,KAAa,EACb,MAAc,EACd,YAAwB,EACxB,mBAAyC,EACzC,kBAAgD,EAChD,SAAkB;QAElB,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,mBAAmB,IAAI,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACjI,+GAA+G;QAC/G,MAAM,mBAAmB,GAAG,IAAI,CAAC,kCAAkC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAkC,CAAC;QAC7I,IAAI,CAAC,0BAA0B,CAAC,mBAAmB,CAAC,CAAC;QACrD,OAAO,mBAAmB,CAAC;IAC/B,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACK,0BAA0B,CAAC,mBAAwC;QACvE,mBAAmB,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACjD,6FAA6F;YAC7F,IAAI,mBAAmB,CAAC,gBAAgB,EAAE,CAAC;gBACvC,OAAO;YACX,CAAC;YACD,MAAM,KAAK,GAAG,mBAAmB,CAAC,QAAQ,EAAE,CAAC;YAC7C,kGAAkG;YAClG,gDAAgD;YAChD,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gBAC5B,OAAO;YACX,CAAC;YACD,gGAAgG;YAChG,6FAA6F;YAC7F,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,IAAI,KAAK,EAAE,UAAU,IAAI,IAAI,EAAE,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACrH,mBAAmB,CAAC,QAAQ,GAAG,IAAI,CAAC;QACxC,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;;;OASG;IACO,yCAAyC,CAAC,mBAAwC,EAAE,YAAwB,EAAE,mBAAyC;QAC7J,MAAM,KAAK,GAAG,mBAAmB,CAAC,QAAQ,CAAC;QAC3C,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,aAAa,CAAC,0BAA0B,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QACvE,CAAC;QACD,MAAM,KAAK,GAAG,mBAAmB,CAAC,YAAY,EAAE,oBAAoB,CAAC;QACrE,IAAI,KAAK,IAAI,mBAAmB,EAAE,CAAC;YAC/B,IAAI,CAAC,aAAa,CAAC,0BAA0B,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;QAC9E,CAAC;IACL,CAAC;CACJ","sourcesContent":["import { Constants } from \"../Engines/constants\";\nimport { type WebGPUEngine } from \"../Engines/webgpuEngine\";\nimport { type InternalTexture } from \"../Materials/Textures/internalTexture\";\nimport { type RenderTargetTexture } from \"../Materials/Textures/renderTargetTexture.pure\";\nimport { type Nullable } from \"../types\";\nimport { WebXRLayerRenderTargetTexture } from \"./webXRLayerRenderTargetTexture\";\nimport { WebXRLayerRenderTargetTextureProvider } from \"./webXRRenderTargetTextureProvider\";\n\n/**\n * Maps a WebGPU depth/stencil {@link GPUTextureFormat} to the matching Babylon `TEXTUREFORMAT_*` constant.\n *\n * The engine reads `InternalTexture.format` (a Babylon constant) when it builds the render pass depth\n * attachment for a render target, so a depth texture wrapped from an external `GPUTexture` must carry the\n * correct Babylon format or the depth attachment pipeline format will not match the sub-image's texture.\n * @param format the WebGPU depth/stencil format requested when the layer was created\n * @returns the matching Babylon texture format constant\n */\nfunction GetBabylonDepthFormat(format: GPUTextureFormat): number {\n    switch (format) {\n        case \"depth16unorm\":\n            return Constants.TEXTUREFORMAT_DEPTH16;\n        case \"depth24plus\":\n            return Constants.TEXTUREFORMAT_DEPTH24;\n        case \"depth24plus-stencil8\":\n            return Constants.TEXTUREFORMAT_DEPTH24_STENCIL8;\n        case \"depth32float\":\n            return Constants.TEXTUREFORMAT_DEPTH32_FLOAT;\n        case \"depth32float-stencil8\":\n            return Constants.TEXTUREFORMAT_DEPTH32FLOAT_STENCIL8;\n        case \"stencil8\":\n            return Constants.TEXTUREFORMAT_STENCIL8;\n        default:\n            // Fall back to a combined depth/stencil format, which is the projection layer default.\n            return Constants.TEXTUREFORMAT_DEPTH24_STENCIL8;\n    }\n}\n\n/**\n * Provides render target textures for WebGPU-backed XR layers. Owns all WebGPU-specific texture wrapping\n * (via {@link WebGPUEngine.wrapWebGPUTexture} / {@link WebGPUEngine.updateWrappedWebGPUTexture}) so the base\n * provider can stay graphics-API-agnostic. Mirrors {@link WebXRWebGLRenderTargetTextureProvider} for the\n * WebGPU (XRGPUBinding) backend.\n * @internal\n */\nexport abstract class WebXRWebGPURenderTargetTextureProvider extends WebXRLayerRenderTargetTextureProvider {\n    private get _webgpuEngine(): WebGPUEngine {\n        return this._engine as WebGPUEngine;\n    }\n\n    private _wrapColorTexture(texture: GPUTexture): InternalTexture {\n        return this._webgpuEngine.wrapWebGPUTexture(texture);\n    }\n\n    private _wrapDepthTexture(texture: GPUTexture, depthStencilFormat: GPUTextureFormat): InternalTexture {\n        const internalTexture = this._webgpuEngine.wrapWebGPUTexture(texture);\n        // The engine derives the color attachment format automatically from the wrapped hardware texture,\n        // but the depth attachment format is read from the Babylon InternalTexture.format, which\n        // wrapWebGPUTexture does not set. Assign it here from the format the layer was created with.\n        internalTexture.format = GetBabylonDepthFormat(depthStencilFormat);\n        return internalTexture;\n    }\n\n    /**\n     * Builds the render target shell as a {@link WebXRLayerRenderTargetTexture} for the single-view path so\n     * each eye can bind its own array layer of a layered projection-layer texture. Multiview is not yet\n     * supported on this WebGPU path and is delegated to the base implementation.\n     * @param width the width of the render target\n     * @param height the height of the render target\n     * @param multiview whether the render target should be a multiview render target\n     * @returns the created (but not yet registered) render target texture\n     */\n    protected override _createRenderTargetTextureShell(width: number, height: number, multiview: boolean): RenderTargetTexture {\n        if (multiview) {\n            return super._createRenderTargetTextureShell(width, height, multiview);\n        }\n        const renderTargetTexture = new WebXRLayerRenderTargetTexture(\"XR renderTargetTexture\", { width, height }, this._scene);\n        renderTargetTexture.renderTarget!._samples = renderTargetTexture.samples;\n        return renderTargetTexture;\n    }\n\n    /**\n     * Wraps the sub-image's color (and optional depth/stencil) GPUTextures and builds a new render target\n     * texture around them. Use this on first creation and whenever the sub-image texture size changes.\n     * @param width the width of the render target\n     * @param height the height of the render target\n     * @param colorTexture the sub-image color GPUTexture\n     * @param depthStencilTexture the sub-image depth/stencil GPUTexture, if any\n     * @param depthStencilFormat the WebGPU depth/stencil format the layer was created with, if depth is provided\n     * @param multiview whether the render target should be a multiview render target\n     * @returns the created render target texture\n     */\n    protected _createRenderTargetTextureFromGPUTextures(\n        width: number,\n        height: number,\n        colorTexture: GPUTexture,\n        depthStencilTexture: Nullable<GPUTexture>,\n        depthStencilFormat: GPUTextureFormat | undefined,\n        multiview: boolean\n    ): WebXRLayerRenderTargetTexture {\n        const color = this._wrapColorTexture(colorTexture);\n        const depth = depthStencilTexture && depthStencilFormat ? this._wrapDepthTexture(depthStencilTexture, depthStencilFormat) : null;\n        // Single-view (the only path here) always builds a WebXRLayerRenderTargetTexture via the shell override above.\n        const renderTargetTexture = this._createRenderTargetTextureInternal(width, height, color, depth, multiview) as WebXRLayerRenderTargetTexture;\n        this._attachPerEyeClearObserver(renderTargetTexture);\n        return renderTargetTexture;\n    }\n\n    /**\n     * Ensures this render target is cleared every frame, including for the right eye.\n     *\n     * `Scene._clearFrameBuffer` skips clearing the right rig camera's framebuffer (`!camera.isRightCamera`).\n     * That is a valid optimization for WebGL2 stereo, where both eyes render into a single side-by-side\n     * texture and the left eye's full clear already covers the whole texture. WebGPU projection layers give\n     * each eye its OWN render target (a distinct array layer rendered in a separate render pass), so the\n     * right eye's color and — critically — depth would never be cleared, leaving its depth test to reject\n     * every fragment (a black right eye). The scene notifies `onClearObservable` regardless of\n     * `camera.isRightCamera`, so this observer clears both eyes' targets. WebGL providers never attach it,\n     * so the WebGL path is unchanged.\n     *\n     * The observer mirrors the clear semantics of `Scene._clearFrameBuffer` (minus the right-eye skip): it\n     * only clears when the scene has `autoClear` enabled, clears color at most once per frame (guarded by\n     * `RenderTargetTexture._cleared`, which the scene resets per frame in `_checkCameraRenderTarget`), always\n     * clears depth+stencil, and honors `skipInitialClear`. This keeps the \"clear once per RTT per frame\"\n     * contract instead of clearing color on every notification.\n     * @param renderTargetTexture the per-eye render target to clear each frame\n     */\n    private _attachPerEyeClearObserver(renderTargetTexture: RenderTargetTexture): void {\n        renderTargetTexture.onClearObservable.add((engine) => {\n            // Honor skipInitialClear so this observer preserves the default clear semantics it replaces.\n            if (renderTargetTexture.skipInitialClear) {\n                return;\n            }\n            const scene = renderTargetTexture.getScene();\n            // When autoClear is disabled the scene does not clear render targets; match that so this observer\n            // does not force a clear the user opted out of.\n            if (scene && !scene.autoClear) {\n                return;\n            }\n            // Clear color only once per frame (!_cleared), always clear depth+stencil, then mark the target\n            // cleared for this frame so a second notification in the same frame does not re-clear color.\n            engine.clear(renderTargetTexture.clearColor ?? scene?.clearColor ?? null, !renderTargetTexture._cleared, true, true);\n            renderTargetTexture._cleared = true;\n        });\n    }\n\n    /**\n     * Repoints the wrapped color/depth textures of an existing render target at the current frame's\n     * GPUTextures, preserving the RenderTargetTexture / InternalTexture identity held by the XR camera's\n     * `outputRenderTarget`. The sub-image textures are only valid for the current frame and may rotate from\n     * a compositor pool, so this must run every frame. The new GPUTextures must have the same dimensions as\n     * the wrapped ones (guaranteed by the caller's size-change branch, which rebuilds instead).\n     * @param renderTargetTexture the render target whose wrapped textures should be repointed\n     * @param colorTexture the current frame's color GPUTexture\n     * @param depthStencilTexture the current frame's depth/stencil GPUTexture, if any\n     */\n    protected _updateRenderTargetTextureFromGPUTextures(renderTargetTexture: RenderTargetTexture, colorTexture: GPUTexture, depthStencilTexture: Nullable<GPUTexture>): void {\n        const color = renderTargetTexture._texture;\n        if (color) {\n            this._webgpuEngine.updateWrappedWebGPUTexture(color, colorTexture);\n        }\n        const depth = renderTargetTexture.renderTarget?._depthStencilTexture;\n        if (depth && depthStencilTexture) {\n            this._webgpuEngine.updateWrappedWebGPUTexture(depth, depthStencilTexture);\n        }\n    }\n}\n"]}
+{"version":3,"file":"webXRWebGPURenderTargetTextureProvider.js","sourceRoot":"","sources":["../../../../dev/core/src/XR/webXRWebGPURenderTargetTextureProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Constants } from \"../Engines/constants\";\nimport { type WebGPUEngine } from \"../Engines/webgpuEngine\";\nimport { type WebGPURenderTargetWrapper } from \"../Engines/WebGPU/webgpuRenderTargetWrapper\";\nimport { type InternalTexture } from \"../Materials/Textures/internalTexture\";\nimport { type RenderTargetTexture } from \"../Materials/Textures/renderTargetTexture.pure\";\nimport { Color4 } from \"../Maths/math.color.pure\";\nimport { type Nullable } from \"../types\";\nimport { WebXRLayerRenderTargetTexture } from \"./webXRLayerRenderTargetTexture\";\nimport { type WebXRLayerWrapper } from \"./webXRLayerWrapper\";\nimport { WebXRLayerRenderTargetTextureProvider } from \"./webXRRenderTargetTextureProvider\";\nimport { type WebXRSessionManager } from \"./webXRSessionManager\";\n\n/**\n * Maps a WebGPU depth/stencil {@link GPUTextureFormat} to the matching Babylon `TEXTUREFORMAT_*` constant.\n *\n * The engine reads `InternalTexture.format` (a Babylon constant) when it builds the render pass depth\n * attachment for a render target, so a depth texture wrapped from an external `GPUTexture` must carry the\n * correct Babylon format or the depth attachment pipeline format will not match the sub-image's texture.\n * @param format the WebGPU depth/stencil format requested when the layer was created\n * @returns the matching Babylon texture format constant\n */\nfunction GetBabylonDepthFormat(format: GPUTextureFormat): number {\n    switch (format) {\n        case \"depth16unorm\":\n            return Constants.TEXTUREFORMAT_DEPTH16;\n        case \"depth24plus\":\n            return Constants.TEXTUREFORMAT_DEPTH24;\n        case \"depth24plus-stencil8\":\n            return Constants.TEXTUREFORMAT_DEPTH24_STENCIL8;\n        case \"depth32float\":\n            return Constants.TEXTUREFORMAT_DEPTH32_FLOAT;\n        case \"depth32float-stencil8\":\n            return Constants.TEXTUREFORMAT_DEPTH32FLOAT_STENCIL8;\n        case \"stencil8\":\n            return Constants.TEXTUREFORMAT_STENCIL8;\n        default:\n            // Fall back to a combined depth/stencil format, which is the projection layer default.\n            return Constants.TEXTUREFORMAT_DEPTH24_STENCIL8;\n    }\n}\n\n/**\n * Provides render target textures for WebGPU-backed XR layers. Owns all WebGPU-specific texture wrapping\n * (via {@link WebGPUEngine.wrapWebGPUTexture} / {@link WebGPUEngine.updateWrappedWebGPUTexture}) so the base\n * provider can stay graphics-API-agnostic. Mirrors {@link WebXRWebGLRenderTargetTextureProvider} for the\n * WebGPU (XRGPUBinding) backend.\n * @internal\n */\nexport abstract class WebXRWebGPURenderTargetTextureProvider extends WebXRLayerRenderTargetTextureProvider {\n    private readonly _transparentClearColor = new Color4(0, 0, 0, 0);\n\n    constructor(\n        protected readonly _xrSessionManager: WebXRSessionManager,\n        layerWrapper: WebXRLayerWrapper\n    ) {\n        super(_xrSessionManager.scene, layerWrapper);\n    }\n\n    private get _webgpuEngine(): WebGPUEngine {\n        return this._engine as WebGPUEngine;\n    }\n\n    private _wrapColorTexture(texture: GPUTexture): InternalTexture {\n        return this._webgpuEngine.wrapWebGPUTexture(texture);\n    }\n\n    private _wrapDepthTexture(texture: GPUTexture, depthStencilFormat: GPUTextureFormat): InternalTexture {\n        const internalTexture = this._webgpuEngine.wrapWebGPUTexture(texture);\n        // The engine derives the color attachment format automatically from the wrapped hardware texture,\n        // but the depth attachment format is read from the Babylon InternalTexture.format, which\n        // wrapWebGPUTexture does not set. Assign it here from the format the layer was created with.\n        internalTexture.format = GetBabylonDepthFormat(depthStencilFormat);\n        return internalTexture;\n    }\n\n    /**\n     * Builds the render target shell as a {@link WebXRLayerRenderTargetTexture} for the single-view path so\n     * each eye can bind its own array layer of a layered projection-layer texture. Multiview is not yet\n     * supported on this WebGPU path and is delegated to the base implementation.\n     * @param width the width of the render target\n     * @param height the height of the render target\n     * @param multiview whether the render target should be a multiview render target\n     * @returns the created (but not yet registered) render target texture\n     */\n    protected override _createRenderTargetTextureShell(width: number, height: number, multiview: boolean): RenderTargetTexture {\n        if (multiview) {\n            return super._createRenderTargetTextureShell(width, height, multiview);\n        }\n        const renderTargetTexture = new WebXRLayerRenderTargetTexture(\"XR renderTargetTexture\", { width, height }, this._scene);\n        renderTargetTexture.renderTarget!._samples = renderTargetTexture.samples;\n        // The projection-layer texture is presented directly by the XR compositor (top-left origin, never\n        // re-sampled by Babylon), so opt this target out of the engine's render-target Y-flip / winding\n        // compensation and render it upright, matching the WebXR/WebGPU spec's plain render pass.\n        (renderTargetTexture.renderTarget as WebGPURenderTargetWrapper)._disableEngineYFlip = true;\n        return renderTargetTexture;\n    }\n\n    /**\n     * Wraps the sub-image's color (and optional depth/stencil) GPUTextures and builds a new render target\n     * texture around them. Use this on first creation and whenever the sub-image texture size changes.\n     * @param width the width of the render target\n     * @param height the height of the render target\n     * @param colorTexture the sub-image color GPUTexture\n     * @param depthStencilTexture the sub-image depth/stencil GPUTexture, if any\n     * @param depthStencilFormat the WebGPU depth/stencil format the layer was created with, if depth is provided\n     * @param multiview whether the render target should be a multiview render target\n     * @returns the created render target texture\n     */\n    protected _createRenderTargetTextureFromGPUTextures(\n        width: number,\n        height: number,\n        colorTexture: GPUTexture,\n        depthStencilTexture: Nullable<GPUTexture>,\n        depthStencilFormat: GPUTextureFormat | undefined,\n        multiview: boolean\n    ): WebXRLayerRenderTargetTexture {\n        const color = this._wrapColorTexture(colorTexture);\n        const depth = depthStencilTexture && depthStencilFormat ? this._wrapDepthTexture(depthStencilTexture, depthStencilFormat) : null;\n        // Single-view (the only path here) always builds a WebXRLayerRenderTargetTexture via the shell override above.\n        const renderTargetTexture = this._createRenderTargetTextureInternal(width, height, color, depth, multiview) as WebXRLayerRenderTargetTexture;\n        this._attachPerEyeClearObserver(renderTargetTexture);\n        return renderTargetTexture;\n    }\n\n    /**\n     * Ensures this render target is cleared every frame, including for the right eye.\n     *\n     * `Scene._clearFrameBuffer` skips clearing the right rig camera's framebuffer (`!camera.isRightCamera`).\n     * That is a valid optimization for WebGL2 stereo, where both eyes render into a single side-by-side\n     * texture and the left eye's full clear already covers the whole texture. WebGPU projection layers give\n     * each eye its OWN render target (a distinct array layer rendered in a separate render pass), so the\n     * right eye's color and — critically — depth would never be cleared, leaving its depth test to reject\n     * every fragment (a black right eye). The scene notifies `onClearObservable` regardless of\n     * `camera.isRightCamera`, so this observer clears both eyes' targets. WebGL providers never attach it,\n     * so the WebGL path is unchanged.\n     *\n     * Color is cleared at most once per ENGINE FRAME, not once per `Scene.render`. The distinction matters:\n     * more than one scene can render the same XR camera within a single XR frame. `UtilityLayerRenderer`\n     * (used by controller pointer selection and near interaction) renders a second scene through the same\n     * rig cameras, and every `Scene.render` resets `RenderTargetTexture._cleared` for those cameras' targets\n     * (`Scene._checkCameraRenderTarget`), so a `_cleared`-based guard is defeated and each eye is re-cleared\n     * after it was drawn — presenting a clear-colored frame with the geometry gone. `AbstractEngine.frameId`\n     * only advances in `endFrame`, once per XR frame, so unlike `_cleared` it cannot be reset by another\n     * scene rendering the same camera.\n     *\n     * In immersive AR, color is cleared to transparent when `WebXRExperienceHelper` disables\n     * `Scene.autoClear`. WebGL XR framebuffers are cleared to transparent by the user agent, but WebGPU render\n     * passes require the application to request that clear explicitly. Skipping it leaves pixels from prior\n     * frames in passthrough regions, producing trails behind moving objects.\n     *\n     * Depth and stencil are still cleared on every notification, matching the previous behavior and the\n     * expectations of overlay scenes that draw on top of the main scene.\n     * @param renderTargetTexture the per-eye render target to clear each frame\n     */\n    private _attachPerEyeClearObserver(renderTargetTexture: RenderTargetTexture): void {\n        let lastColorClearedFrameId = -1;\n        renderTargetTexture.onClearObservable.add((engine) => {\n            // Honor skipInitialClear so this observer preserves the default clear semantics it replaces.\n            if (renderTargetTexture.skipInitialClear) {\n                return;\n            }\n            const scene = renderTargetTexture.getScene();\n            const isImmersiveAR = this._xrSessionManager.sessionMode === \"immersive-ar\";\n            // When autoClear is disabled the scene does not clear render targets; match that so this observer\n            // does not force a clear the user opted out of. Immersive AR is the exception: the experience\n            // helper disables autoClear because WebGL XR is cleared by the user agent, while WebGPU is not.\n            if (scene && !scene.autoClear && !isImmersiveAR) {\n                return;\n            }\n            const clearColor = engine.frameId !== lastColorClearedFrameId;\n            const color = isImmersiveAR && scene && !scene.autoClear ? this._transparentClearColor : (renderTargetTexture.clearColor ?? scene?.clearColor ?? null);\n            engine.clear(color, clearColor, true, true);\n            if (clearColor) {\n                lastColorClearedFrameId = engine.frameId;\n            }\n            // Kept in sync so anything else reading the flag still sees this target as cleared this frame.\n            renderTargetTexture._cleared = true;\n        });\n    }\n\n    /**\n     * Repoints the wrapped color/depth textures of an existing render target at the current frame's\n     * GPUTextures, preserving the RenderTargetTexture / InternalTexture identity held by the XR camera's\n     * `outputRenderTarget`. The sub-image textures are only valid for the current frame and may rotate from\n     * a compositor pool, so this must run every frame. The new GPUTextures must have the same dimensions as\n     * the wrapped ones (guaranteed by the caller's size-change branch, which rebuilds instead).\n     * @param renderTargetTexture the render target whose wrapped textures should be repointed\n     * @param colorTexture the current frame's color GPUTexture\n     * @param depthStencilTexture the current frame's depth/stencil GPUTexture, if any\n     */\n    protected _updateRenderTargetTextureFromGPUTextures(renderTargetTexture: RenderTargetTexture, colorTexture: GPUTexture, depthStencilTexture: Nullable<GPUTexture>): void {\n        const color = renderTargetTexture._texture;\n        if (color) {\n            this._webgpuEngine.updateWrappedWebGPUTexture(color, colorTexture);\n        }\n        const depth = renderTargetTexture.renderTarget?._depthStencilTexture;\n        if (depth && depthStencilTexture) {\n            this._webgpuEngine.updateWrappedWebGPUTexture(depth, depthStencilTexture);\n        }\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@onerjs/core",
-    "version": "8.54.3",
+    "version": "8.54.5",
     "main": "index.js",
     "module": "index.js",
     "types": "index.d.ts",

package/scene.pure.d.ts

@@ -1118,6 +1118,13 @@ export declare class Scene implements IAnimatable, IClipPlanesHolder, IAssetCont
     /** @internal */
     _pendingData: any[];
     private _isDisposed;
+    /**
+     * @internal
+     * Set to true once scene disposal has begun (it stays true afterwards). Used so that resources released during
+     * teardown (e.g. mesh effects) are freed immediately instead of being deferred to the next frame, which may never
+     * happen once rendering stops.
+     */
+    _isDisposing: boolean;
     private _isReadyChecks;
     /**
      * Gets or sets a boolean indicating that all submeshes of active meshes must be rendered

package/scene.pure.js

@@ -1321,6 +1321,13 @@ export class Scene {
         /** @internal */
         this._pendingData = [];
         this._isDisposed = false;
+        /**
+         * @internal
+         * Set to true once scene disposal has begun (it stays true afterwards). Used so that resources released during
+         * teardown (e.g. mesh effects) are freed immediately instead of being deferred to the next frame, which may never
+         * happen once rendering stops.
+         */
+        this._isDisposing = false;
         this._isReadyChecks = [];
         /**
          * Gets or sets a boolean indicating that all submeshes of active meshes must be rendered
@@ -4635,6 +4642,7 @@ export class Scene {
         if (this.isDisposed) {
             return;
         }
+        this._isDisposing = true;
         this.beforeRender = null;
         this.afterRender = null;
         this.metadata = null;