Skip to content

Commit 517bbd7

Browse files
authored
Merge pull request #14146 from mrdoob/webxr
WebXRManager: Expose frameOfReferenceType
2 parents be2aa4a + 0fa90fd commit 517bbd7

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

examples/js/vr/WebVR.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
var WEBVR = {
99

10-
createButton: function ( renderer ) {
10+
createButton: function ( renderer, options ) {
1111

1212
function showEnterVR( device ) {
1313

@@ -38,9 +38,12 @@ var WEBVR = {
3838

3939
function onSessionStarted( session ) {
4040

41+
if ( options === undefined ) options = {};
42+
if ( options.frameOfReferenceType === undefined ) options.frameOfReferenceType = 'stage';
43+
4144
session.addEventListener( 'end', onSessionEnded );
4245

43-
renderer.vr.setSession( session );
46+
renderer.vr.setSession( session, options );
4447
button.textContent = 'EXIT XR';
4548

4649
currentSession = session;

examples/webvr_panorama.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
renderer.vr.userHeight = 0; // TOFIX
4444
document.body.appendChild( renderer.domElement );
4545

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

4848
//
4949

examples/webvr_rollercoaster.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
renderer.vr.userHeight = 0; // TOFIX
4141
document.body.appendChild( renderer.domElement );
4242

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

4545
//
4646

src/renderers/webvr/WebXRManager.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function WebXRManager( renderer ) {
5858

5959
//
6060

61-
this.setSession = function ( value ) {
61+
this.setSession = function ( value, options ) {
6262

6363
session = value;
6464

@@ -72,7 +72,7 @@ function WebXRManager( renderer ) {
7272
} );
7373

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

7777
frameOfRef = value;
7878

0 commit comments

Comments
 (0)