Skip to content

Consider case when both WebVR and WebXR are available #4022

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 1 commit into from
Feb 15, 2019
Merged

Consider case when both WebVR and WebXR are available #4022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions src/core/scene/a-scene.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,22 +138,24 @@ module.exports.AScene = registerElement('a-scene', {
this.pointerRestrictedBound = function () { self.pointerRestricted(); };
this.pointerUnrestrictedBound = function () { self.pointerUnrestricted(); };

// Enter VR on `vrdisplayactivate` (e.g. putting on Rift headset).
window.addEventListener('vrdisplayactivate', this.enterVRBound);
if (!isWebXRAvailable) {
// Enter VR on `vrdisplayactivate` (e.g. putting on Rift headset).
window.addEventListener('vrdisplayactivate', this.enterVRBound);

// Exit VR on `vrdisplaydeactivate` (e.g. taking off Rift headset).
window.addEventListener('vrdisplaydeactivate', this.exitVRBound);
// Exit VR on `vrdisplaydeactivate` (e.g. taking off Rift headset).
window.addEventListener('vrdisplaydeactivate', this.exitVRBound);

// Exit VR on `vrdisplaydisconnect` (e.g. unplugging Rift headset).
window.addEventListener('vrdisplaydisconnect', this.exitVRTrueBound);
// Exit VR on `vrdisplaydisconnect` (e.g. unplugging Rift headset).
window.addEventListener('vrdisplaydisconnect', this.exitVRTrueBound);

// Register for mouse restricted events while in VR
// (e.g. mouse no longer available on desktop 2D view)
window.addEventListener('vrdisplaypointerrestricted', this.pointerRestrictedBound);
// Register for mouse restricted events while in VR
// (e.g. mouse no longer available on desktop 2D view)
window.addEventListener('vrdisplaypointerrestricted', this.pointerRestrictedBound);

// Register for mouse unrestricted events while in VR
// (e.g. mouse once again available on desktop 2D view)
window.addEventListener('vrdisplaypointerunrestricted', this.pointerUnrestrictedBound);
// Register for mouse unrestricted events while in VR
// (e.g. mouse once again available on desktop 2D view)
window.addEventListener('vrdisplaypointerunrestricted', this.pointerUnrestrictedBound);
}
},
writable: window.debug
},
Expand Down
6 changes: 5 additions & 1 deletion src/core/scene/loadingScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ var LOADER_TITLE_CLASS = 'a-loader-title';
// It catches vrdisplayactivate early to ensure we can enter VR mode after the scene loads.
window.addEventListener('vrdisplayactivate', function () {
var vrManager = sceneEl.renderer.vr;
var vrDisplay = utils.device.getVRDisplay();
var vrDisplay;

// WebXR takes priority if available.
if (navigator.xr) { return; }

vrDisplay = utils.device.getVRDisplay();
vrManager.setDevice(vrDisplay);
vrManager.enabled = true;
if (!vrDisplay.isPresenting) {
Expand Down