WebXRManager: Revert support of EffectComposer. (#26904)

* Revert "Examples: Clean up. (#26901)" This reverts commit 306fb93. * Revert "Updated builds." This reverts commit 7aba3d2. * Revert "WebGLRenderer: Improve offscreen rendering in WebXR. (#26160)" This reverts commit afdfa33.
mrdoob · Oct 6, 2023 · d2d3eed · d2d3eed
1 parent 306fb93
commit d2d3eed
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 268 deletions.
diff --git a/build/three.cjs b/build/three.cjs
@@ -26437,9 +26437,6 @@ class WebXRManager extends EventDispatcher {
 		const controllers = [];
 		const controllerInputSources = [];
 
-		const currentSize = new Vector2();
-		let currentPixelRatio = null;
-
 		//
 
 		const cameraL = new PerspectiveCamera();
@@ -26572,9 +26569,6 @@ class WebXRManager extends EventDispatcher {
 
 			//
 
-			renderer.setPixelRatio( currentPixelRatio );
-			renderer.setSize( currentSize.width, currentSize.height, false );
-
 			animation.stop();
 
 			scope.isPresenting = false;
@@ -26631,12 +26625,6 @@ class WebXRManager extends EventDispatcher {
 
 		};
 
-		this._getRenderTarget = function () {
-
-			return newRenderTarget;
-
-		};
-
 		this.getFrame = function () {
 
 			return xrFrame;
@@ -26686,9 +26674,6 @@ class WebXRManager extends EventDispatcher {
 
 					session.updateRenderState( { baseLayer: glBaseLayer } );
 
-					renderer.setPixelRatio( 1 );
-					renderer.setSize( glBaseLayer.framebufferWidth, glBaseLayer.framebufferHeight, false );
-
 					newRenderTarget = new WebGLRenderTarget(
 						glBaseLayer.framebufferWidth,
 						glBaseLayer.framebufferHeight,
@@ -26726,9 +26711,6 @@ class WebXRManager extends EventDispatcher {
 
 					session.updateRenderState( { layers: [ glProjLayer ] } );
 
-					renderer.setPixelRatio( 1 );
-					renderer.setSize( glProjLayer.textureWidth, glProjLayer.textureHeight, false );
-
 					newRenderTarget = new WebGLRenderTarget(
 						glProjLayer.textureWidth,
 						glProjLayer.textureHeight,
@@ -26753,9 +26735,6 @@ class WebXRManager extends EventDispatcher {
 				customReferenceSpace = null;
 				referenceSpace = await session.requestReferenceSpace( referenceSpaceType );
 
-				currentPixelRatio = renderer.getPixelRatio();
-				renderer.getSize( currentSize );
-
 				animation.setContext( session );
 				animation.start();
 
@@ -30148,13 +30127,6 @@ class WebGLRenderer {
 
 		this.setRenderTarget = function ( renderTarget, activeCubeFace = 0, activeMipmapLevel = 0 ) {
 
-			// Render to base layer instead of canvas in WebXR
-			if ( renderTarget === null && this.xr.isPresenting ) {
-
-				renderTarget = this.xr._getRenderTarget();
-
-			}
-
 			_currentRenderTarget = renderTarget;
 			_currentActiveCubeFace = activeCubeFace;
 			_currentActiveMipmapLevel = activeMipmapLevel;

diff --git a/build/three.js b/build/three.js
@@ -26442,9 +26442,6 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
 			const controllers = [];
 			const controllerInputSources = [];
 
-			const currentSize = new Vector2();
-			let currentPixelRatio = null;
-
 			//
 
 			const cameraL = new PerspectiveCamera();
@@ -26577,9 +26574,6 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
 
 				//
 
-				renderer.setPixelRatio( currentPixelRatio );
-				renderer.setSize( currentSize.width, currentSize.height, false );
-
 				animation.stop();
 
 				scope.isPresenting = false;
@@ -26636,12 +26630,6 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
 
 			};
 
-			this._getRenderTarget = function () {
-
-				return newRenderTarget;
-
-			};
-
 			this.getFrame = function () {
 
 				return xrFrame;
@@ -26691,9 +26679,6 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
 
 						session.updateRenderState( { baseLayer: glBaseLayer } );
 
-						renderer.setPixelRatio( 1 );
-						renderer.setSize( glBaseLayer.framebufferWidth, glBaseLayer.framebufferHeight, false );
-
 						newRenderTarget = new WebGLRenderTarget(
 							glBaseLayer.framebufferWidth,
 							glBaseLayer.framebufferHeight,
@@ -26731,9 +26716,6 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
 
 						session.updateRenderState( { layers: [ glProjLayer ] } );
 
-						renderer.setPixelRatio( 1 );
-						renderer.setSize( glProjLayer.textureWidth, glProjLayer.textureHeight, false );
-
 						newRenderTarget = new WebGLRenderTarget(
 							glProjLayer.textureWidth,
 							glProjLayer.textureHeight,
@@ -26758,9 +26740,6 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
 					customReferenceSpace = null;
 					referenceSpace = await session.requestReferenceSpace( referenceSpaceType );
 
-					currentPixelRatio = renderer.getPixelRatio();
-					renderer.getSize( currentSize );
-
 					animation.setContext( session );
 					animation.start();
 
@@ -30153,13 +30132,6 @@ console.warn( 'Scripts "build/three.js" and "build/three.min.js" are deprecated
 
 			this.setRenderTarget = function ( renderTarget, activeCubeFace = 0, activeMipmapLevel = 0 ) {
 
-				// Render to base layer instead of canvas in WebXR
-				if ( renderTarget === null && this.xr.isPresenting ) {
-
-					renderTarget = this.xr._getRenderTarget();
-
-				}
-
 				_currentRenderTarget = renderTarget;
 				_currentActiveCubeFace = activeCubeFace;
 				_currentActiveMipmapLevel = activeMipmapLevel;

diff --git a/build/three.min.js b/build/three.min.js
diff --git a/build/three.module.js b/build/three.module.js
@@ -26435,9 +26435,6 @@ class WebXRManager extends EventDispatcher {
 		const controllers = [];
 		const controllerInputSources = [];
 
-		const currentSize = new Vector2();
-		let currentPixelRatio = null;
-
 		//
 
 		const cameraL = new PerspectiveCamera();
@@ -26570,9 +26567,6 @@ class WebXRManager extends EventDispatcher {
 
 			//
 
-			renderer.setPixelRatio( currentPixelRatio );
-			renderer.setSize( currentSize.width, currentSize.height, false );
-
 			animation.stop();
 
 			scope.isPresenting = false;
@@ -26629,12 +26623,6 @@ class WebXRManager extends EventDispatcher {
 
 		};
 
-		this._getRenderTarget = function () {
-
-			return newRenderTarget;
-
-		};
-
 		this.getFrame = function () {
 
 			return xrFrame;
@@ -26684,9 +26672,6 @@ class WebXRManager extends EventDispatcher {
 
 					session.updateRenderState( { baseLayer: glBaseLayer } );
 
-					renderer.setPixelRatio( 1 );
-					renderer.setSize( glBaseLayer.framebufferWidth, glBaseLayer.framebufferHeight, false );
-
 					newRenderTarget = new WebGLRenderTarget(
 						glBaseLayer.framebufferWidth,
 						glBaseLayer.framebufferHeight,
@@ -26724,9 +26709,6 @@ class WebXRManager extends EventDispatcher {
 
 					session.updateRenderState( { layers: [ glProjLayer ] } );
 
-					renderer.setPixelRatio( 1 );
-					renderer.setSize( glProjLayer.textureWidth, glProjLayer.textureHeight, false );
-
 					newRenderTarget = new WebGLRenderTarget(
 						glProjLayer.textureWidth,
 						glProjLayer.textureHeight,
@@ -26751,9 +26733,6 @@ class WebXRManager extends EventDispatcher {
 				customReferenceSpace = null;
 				referenceSpace = await session.requestReferenceSpace( referenceSpaceType );
 
-				currentPixelRatio = renderer.getPixelRatio();
-				renderer.getSize( currentSize );
-
 				animation.setContext( session );
 				animation.start();
 
@@ -30146,13 +30125,6 @@ class WebGLRenderer {
 
 		this.setRenderTarget = function ( renderTarget, activeCubeFace = 0, activeMipmapLevel = 0 ) {
 
-			// Render to base layer instead of canvas in WebXR
-			if ( renderTarget === null && this.xr.isPresenting ) {
-
-				renderTarget = this.xr._getRenderTarget();
-
-			}
-
 			_currentRenderTarget = renderTarget;
 			_currentActiveCubeFace = activeCubeFace;
 			_currentActiveMipmapLevel = activeMipmapLevel;

diff --git a/build/three.module.min.js b/build/three.module.min.js
diff --git a/examples/files.json b/examples/files.json
@@ -367,7 +367,6 @@
 		"webxr_vr_handinput_pressbutton",
 		"webxr_vr_layers",
 		"webxr_vr_panorama",
-		"webxr_vr_postprocessing",
 		"webxr_vr_panorama_depth",
 		"webxr_vr_rollercoaster",
 		"webxr_vr_sandbox",

diff --git a/examples/jsm/postprocessing/EffectComposer.js b/examples/jsm/postprocessing/EffectComposer.js
@@ -10,8 +10,6 @@ import { ShaderPass } from './ShaderPass.js';
 import { MaskPass } from './MaskPass.js';
 import { ClearMaskPass } from './MaskPass.js';
 
-const size = /* @__PURE__ */ new Vector2();
-
 class EffectComposer {
 
 	constructor( renderer, renderTarget ) {
@@ -22,7 +20,7 @@ class EffectComposer {
 
 		if ( renderTarget === undefined ) {
 
-			renderer.getSize( size );
+			const size = renderer.getSize( new Vector2() );
 			this._width = size.width;
 			this._height = size.height;
 
@@ -52,22 +50,6 @@ class EffectComposer {
 
 		this.clock = new Clock();
 
-		this.onSessionStateChange = this.onSessionStateChange.bind( this );
-		this.renderer.xr.addEventListener( 'sessionstart', this.onSessionStateChange );
-		this.renderer.xr.addEventListener( 'sessionend', this.onSessionStateChange );
-
-	}
-
-	onSessionStateChange() {
-
-		this.renderer.getSize( size );
-		this._width = size.width;
-		this._height = size.height;
-
-		this._pixelRatio = this.renderer.xr.isPresenting ? 1 : this.renderer.getPixelRatio();
-
-		this.setSize( this._width, this._height );
-
 	}
 
 	swapBuffers() {
@@ -188,7 +170,7 @@ class EffectComposer {
 
 		if ( renderTarget === undefined ) {
 
-			this.renderer.getSize( size );
+			const size = this.renderer.getSize( new Vector2() );
 			this._pixelRatio = this.renderer.getPixelRatio();
 			this._width = size.width;
 			this._height = size.height;
@@ -242,9 +224,6 @@ class EffectComposer {
 
 		this.copyPass.dispose();
 
-		this.renderer.xr.removeEventListener( 'sessionstart', this.onSessionStateChange );
-		this.renderer.xr.removeEventListener( 'sessionend', this.onSessionStateChange );
-
 	}
 
 }

diff --git a/examples/jsm/postprocessing/Pass.js b/examples/jsm/postprocessing/Pass.js
@@ -63,13 +63,7 @@ class FullScreenQuad {
 
 	render( renderer ) {
 
-		// Disable XR projection for fullscreen effects
-		// https://github.com/mrdoob/three.js/pull/18846
-		const xrEnabled = renderer.xr.enabled;
-
-		renderer.xr.enabled = false;
 		renderer.render( this._mesh, _camera );
-		renderer.xr.enabled = xrEnabled;
 
 	}
 

diff --git a/examples/screenshots/webxr_vr_postprocessing.jpg b/examples/screenshots/webxr_vr_postprocessing.jpg