Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WebXRManager: Use reported XRView.eye for setting stereo layers #29872

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

WebXRManager: Use reported XRView.eye for setting stereo layers #29872

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 47 additions & 20 deletions src/renderers/webxr/WebXRManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,6 @@ class WebXRManager extends EventDispatcher {

//

const cameraL = new PerspectiveCamera();
cameraL.viewport = new Vector4();

const cameraR = new PerspectiveCamera();
cameraR.viewport = new Vector4();

const cameras = [ cameraL, cameraR ];

const cameraXR = new ArrayCamera();

let _currentDepthNear = null;
Expand Down Expand Up @@ -551,8 +543,8 @@ class WebXRManager extends EventDispatcher {

}

cameraXR.near = cameraR.near = cameraL.near = depthNear;
cameraXR.far = cameraR.far = cameraL.far = depthFar;
cameraXR.near = depthNear;
cameraXR.far = depthFar;

if ( _currentDepthNear !== cameraXR.near || _currentDepthFar !== cameraXR.far ) {

Expand All @@ -568,32 +560,52 @@ class WebXRManager extends EventDispatcher {

}

cameraL.layers.mask = camera.layers.mask | 0b010;
cameraR.layers.mask = camera.layers.mask | 0b100;
cameraXR.layers.mask = cameraL.layers.mask | cameraR.layers.mask;

const parent = camera.parent;
const cameras = cameraXR.cameras;

updateCamera( cameraXR, parent );

const userCameraLayerMask = camera.layers.mask;
let cameraXRLayerMask = camera.layers.mask;

for ( let i = 0; i < cameras.length; i ++ ) {

updateCamera( cameras[ i ], parent );
const camera = cameras[ i ];
updateCamera( camera, parent );

camera.near = depthNear;
camera.far = depthFar;

switch ( camera.userData.eye ) {

case 'right':
camera.layers.mask = userCameraLayerMask | 0b100;
break;
case 'none':
case 'left':
default:
camera.layers.mask = userCameraLayerMask | 0b010;
break;

}

cameraXRLayerMask = cameraXRLayerMask | camera.layers.mask;

}

cameraXR.layers.mask = cameraXRLayerMask;

// update projection matrix for proper view frustum culling

if ( cameras.length === 2 ) {

setProjectionFromUnion( cameraXR, cameraL, cameraR );
setProjectionFromUnion( cameraXR, cameras[ 0 ], cameras[ 1 ] );

} else {

// assume single camera setup (AR)

cameraXR.projectionMatrix.copy( cameraL.projectionMatrix );
cameraXR.projectionMatrix.copy( cameras[ 0 ].projectionMatrix );

}

Expand Down Expand Up @@ -743,14 +755,29 @@ class WebXRManager extends EventDispatcher {

}

let camera = cameras[ i ];
let camera = cameraXR.cameras[ i ];

if ( camera === undefined ) {

camera = new PerspectiveCamera();
camera.layers.enable( i );
camera.viewport = new Vector4();
cameras[ i ] = camera;

camera.layers.enable( i ); // is this necessary?

switch ( view.eye ) {

case 'right':
camera.layers.enable( 2 );
break;
case 'none':
case 'left':
default:
camera.layers.enable( 1 );
break;

}

camera.userData.eye = view.eye;

}

Expand Down