Skip to content

WebXRManager: Expose frameOfReferenceType #14146

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

Merged
merged 2 commits into from
May 25, 2018
Merged

WebXRManager: Expose frameOfReferenceType #14146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8914853
WebXRManager: Expose frameOfReferenceType.
mrdoob May 25, 2018
0fa90fd
Added frameOfReferenceType to relevant examples.
mrdoob May 25, 2018
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
7 changes: 5 additions & 2 deletions examples/js/vr/WebVR.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

var WEBVR = {

createButton: function ( renderer ) {
createButton: function ( renderer, options ) {

function showEnterVR( device ) {

Expand Down Expand Up @@ -38,9 +38,12 @@ var WEBVR = {

function onSessionStarted( session ) {

if ( options === undefined ) options = {};
if ( options.frameOfReferenceType === undefined ) options.frameOfReferenceType = 'stage';

session.addEventListener( 'end', onSessionEnded );

renderer.vr.setSession( session );
renderer.vr.setSession( session, options );
button.textContent = 'EXIT XR';

currentSession = session;
Expand Down
2 changes: 1 addition & 1 deletion examples/webvr_panorama.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
renderer.vr.userHeight = 0; // TOFIX
document.body.appendChild( renderer.domElement );

document.body.appendChild( WEBVR.createButton( renderer ) );
document.body.appendChild( WEBVR.createButton( renderer, { frameOfReferenceType: 'headModel' } ) );

//

Expand Down
2 changes: 1 addition & 1 deletion examples/webvr_rollercoaster.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
renderer.vr.userHeight = 0; // TOFIX
document.body.appendChild( renderer.domElement );

document.body.appendChild( WEBVR.createButton( renderer ) );
document.body.appendChild( WEBVR.createButton( renderer, { frameOfReferenceType: 'eyeLevel' } ) );

//

Expand Down
4 changes: 2 additions & 2 deletions src/renderers/webvr/WebXRManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function WebXRManager( renderer ) {

//

this.setSession = function ( value ) {
this.setSession = function ( value, options ) {

session = value;

Expand All @@ -72,7 +72,7 @@ function WebXRManager( renderer ) {
} );

session.baseLayer = new XRWebGLLayer( session, gl );
session.requestFrameOfReference( 'stage' ).then( function ( value ) {
session.requestFrameOfReference( options.frameOfReferenceType ).then( function ( value ) {

frameOfRef = value;

Expand Down