Skip to content

Layers for WebVR #17718

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

Closed
wants to merge 6 commits into from
Closed

Layers for WebVR #17718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f7a1ec
Fixed WebVRManager layers
AmadeusJohansson Oct 12, 2019
7e65cad
Expose camera left & right layers
AmadeusJohansson Oct 12, 2019
58c6513
Fixed WebVR panorama example
AmadeusJohansson Oct 12, 2019
5d4c53d
Fixed WebVR video example
AmadeusJohansson Oct 12, 2019
4bc5952
Added missing Layers import
AmadeusJohansson Oct 12, 2019
fb9a139
Fixed Layers import again
AmadeusJohansson Oct 12, 2019
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
3 changes: 3 additions & 0 deletions examples/webvr_panorama.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.vr.enabled = true;
renderer.vr.leftLayers.disable( 2 );
renderer.vr.rightLayers.disable( 1 );
document.body.appendChild( renderer.domElement );

document.body.appendChild( WEBVR.createButton( renderer, { referenceSpaceType: 'local' } ) );
Expand All @@ -39,6 +41,7 @@

camera = new THREE.PerspectiveCamera( 90, window.innerWidth / window.innerHeight, 1, 1000 );
camera.layers.enable( 1 );
camera.layers.enable( 2 );

var geometry = new THREE.BoxBufferGeometry( 100, 100, 100 );
geometry.scale( 1, 1, - 1 );
Expand Down
5 changes: 4 additions & 1 deletion examples/webvr_video.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
} );

camera = new THREE.PerspectiveCamera( 75, window.innerWidth / window.innerHeight, 1, 2000 );
camera.layers.enable( 1 ); // render left view when no stereo available
camera.layers.enable( 1 );
camera.layers.enable( 2 );

// video

Expand Down Expand Up @@ -117,6 +118,8 @@
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
renderer.vr.enabled = true;
renderer.vr.leftLayers.set( 2 );
renderer.vr.rightLayers.set( 1 );
container.appendChild( renderer.domElement );

document.body.appendChild( WEBVR.createButton( renderer, { referenceSpaceType: 'local' } ) );
Expand Down
3 changes: 3 additions & 0 deletions src/renderers/webvr/WebVRManager.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ import { Group } from '../../objects/Group';
import { PerspectiveCamera } from '../../cameras/PerspectiveCamera';
import { ArrayCamera } from '../../cameras/ArrayCamera';
import { Matrix4 } from '../../math/Matrix4';
import { Layers } from '../../core/Layers';

export class WebVRManager {

constructor( renderer: any );

leftLayers: Layers;
rightLayers: Layers;
enabled: boolean;
getController( id: number ): Group;
getDevice(): VRDisplay | null;
Expand Down
10 changes: 6 additions & 4 deletions src/renderers/webvr/WebVRManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ function WebVRManager( renderer ) {

var cameraL = new PerspectiveCamera();
cameraL.viewport = new Vector4();
cameraL.layers.enable( 1 );
cameraL.layers.enableAll();
this.leftLayers = cameraL.layers;

var cameraR = new PerspectiveCamera();
cameraR.viewport = new Vector4();
cameraR.layers.enable( 2 );
cameraR.layers.enableAll();
this.rightLayers = cameraR.layers;

var cameraVR = new ArrayCamera( [ cameraL, cameraR ] );
cameraVR.layers.enable( 1 );
cameraVR.layers.enable( 2 );

//

Expand Down Expand Up @@ -326,6 +326,8 @@ function WebVRManager( renderer ) {
cameraL.matrixWorldInverse.fromArray( frameData.leftViewMatrix );
cameraR.matrixWorldInverse.fromArray( frameData.rightViewMatrix );

cameraVR.layers.mask = camera.layers.mask;

// TODO (mrdoob) Double check this code

standingMatrixInverse.getInverse( standingMatrix );
Expand Down