XRManager: Clean up. (#30358)

examples/webgpu_xr_cubes.html

@@ -122,7 +122,13 @@
 				controller.addEventListener( 'selectend', onSelectEnd );
 				controller.addEventListener( 'connected', function ( event ) {
 
-					this.add( buildController( event.data ) );
+					const targetRayMode = event.data.targetRayMode;
+
+					if ( targetRayMode === 'tracked-pointer' || targetRayMode === 'gaze' ) {
+
+						this.add( buildController( event.data ) );
+
+					}
 
 				} );
 				controller.addEventListener( 'disconnected', function () {

src/renderers/common/XRManager.js

@@ -882,6 +882,7 @@ function onSessionEnd() {
 
 	// restore framebuffer/rendering state
 
+	renderer.setXRTarget( null );
 	renderer.setRenderTarget( this._currentRenderTarget );
 
 	this._session = null;
@@ -900,8 +901,6 @@ function onSessionEnd() {
 	renderer.setPixelRatio( this._currentPixelRatio );
 	renderer.setSize( this._currentSize.width, this._currentSize.height, false );
 
-	renderer.setXRTarget( null );
-
 	this.dispatchEvent( { type: 'sessionend' } );
 
 }