Skip to content

Match main camera layer #26340

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.

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

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions examples/webxr_vr_video.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.xr.enabled = true;
renderer.xr.setReferenceSpaceType( 'local' );
renderer.xr.setEyeLayers( [ 1, 2 ] ); // set layers on left and right camera;
container.appendChild( renderer.domElement );

document.body.appendChild( VRButton.createButton( renderer ) );
Expand Down
37 changes: 33 additions & 4 deletions src/renderers/webxr/WebXRManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,20 @@ class WebXRManager extends EventDispatcher {
//

const cameraL = new PerspectiveCamera();
cameraL.layers.enable( 1 );
cameraL.viewport = new Vector4();

const cameraR = new PerspectiveCamera();
cameraR.layers.enable( 2 );
cameraR.viewport = new Vector4();

const cameras = [ cameraL, cameraR ];

const cameraXR = new ArrayCamera();
cameraXR.layers.enable( 1 );
cameraXR.layers.enable( 2 );

let _currentDepthNear = null;
let _currentDepthFar = null;
let _currentCameraLayers = null;
let _leftEyeLayer = null;
let _rightEyeLayer = null;

//

Expand Down Expand Up @@ -159,6 +158,7 @@ class WebXRManager extends EventDispatcher {

_currentDepthNear = null;
_currentDepthFar = null;
_currentCameraLayers = null;

// restore framebuffer/rendering state

Expand Down Expand Up @@ -502,6 +502,14 @@ class WebXRManager extends EventDispatcher {

}

this.setEyeLayers = function ( layers ) {

_leftEyeLayer = layers[ 0 ];
_rightEyeLayer = layers[ 1 ];
_currentCameraLayers = null; // force layer setting on next update

};

this.updateCamera = function ( camera ) {

if ( session === null ) return;
Expand All @@ -523,6 +531,27 @@ class WebXRManager extends EventDispatcher {

}

if ( _currentCameraLayers !== camera.layers.mask ) {

const mask = camera.layers.mask;

if ( _leftEyeLayer && _rightEyeLayer ) {

cameraL.layers.mask = mask | 1 << _leftEyeLayer;
cameraR.layers.mask = mask | 1 << _rightEyeLayer;
cameraXR.layers.mask = mask | 1 << _rightEyeLayer | 1 << _leftEyeLayer;

} else {

cameraXR.layers.mask = cameraL.layers.mask = cameraR.layers.mask = mask;

}

_currentCameraLayers = mask;

}


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

Expand Down