Skip to content

WebXRManager: Use async/await in setSession(). #20754

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
Jan 16, 2021
Merged

WebXRManager: Use async/await in setSession(). #20754

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
6ff1d1b
WebXRManager: Use async/await in setSession().
Mugen87 Nov 24, 2020
f8338e5
Merge branch 'dev' into dev51
Mugen87 Jan 14, 2021
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
5 changes: 3 additions & 2 deletions examples/jsm/webxr/ARButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ class ARButton {

let currentSession = null;

function onSessionStarted( session ) {
async function onSessionStarted( session ) {

session.addEventListener( 'end', onSessionEnded );

renderer.xr.setReferenceSpaceType( 'local' );
renderer.xr.setSession( session );

await renderer.xr.setSession( session );

button.textContent = 'STOP AR';
sessionInit.domOverlay.root.style.display = '';

Expand Down
4 changes: 2 additions & 2 deletions examples/jsm/webxr/VRButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ class VRButton {

let currentSession = null;

function onSessionStarted( session ) {
async function onSessionStarted( session ) {

session.addEventListener( 'end', onSessionEnded );

renderer.xr.setSession( session );
await renderer.xr.setSession( session );
button.textContent = 'EXIT VR';

currentSession = session;
Expand Down
29 changes: 10 additions & 19 deletions src/renderers/webxr/WebXRManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,6 @@ function WebXRManager( renderer, gl ) {

}

function onRequestReferenceSpace( value ) {

referenceSpace = value;

animation.setContext( session );
animation.start();

scope.isPresenting = true;

scope.dispatchEvent( { type: 'sessionstart' } );

}

this.setFramebufferScaleFactor = function ( value ) {

framebufferScaleFactor = value;
Expand Down Expand Up @@ -177,7 +164,7 @@ function WebXRManager( renderer, gl ) {

};

this.setSession = function ( value ) {
this.setSession = async function ( value ) {

session = value;

Expand All @@ -190,12 +177,13 @@ function WebXRManager( renderer, gl ) {
session.addEventListener( 'squeezestart', onSessionEvent );
session.addEventListener( 'squeezeend', onSessionEvent );
session.addEventListener( 'end', onSessionEnd );
session.addEventListener( 'inputsourceschange', onInputSourcesChange );

const attributes = gl.getContextAttributes();

if ( attributes.xrCompatible !== true ) {

gl.makeXRCompatible();
await gl.makeXRCompatible();

}

Expand All @@ -212,17 +200,20 @@ function WebXRManager( renderer, gl ) {

session.updateRenderState( { baseLayer: baseLayer } );

session.requestReferenceSpace( referenceSpaceType ).then( onRequestReferenceSpace );
referenceSpace = await session.requestReferenceSpace( referenceSpaceType );

animation.setContext( session );
animation.start();

//
scope.isPresenting = true;

session.addEventListener( 'inputsourceschange', updateInputSources );
scope.dispatchEvent( { type: 'sessionstart' } );

}

};

function updateInputSources( event ) {
function onInputSourcesChange( event ) {

const inputSources = session.inputSources;

Expand Down