Skip to content

Cursor component: call addWebXREventListeners also when rayOrigin is entity #5622

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
dmarcos merged 2 commits into from
Jan 10, 2025
Merged

Cursor component: call addWebXREventListeners also when rayOrigin is entity #5622

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e941fac
Call addWebXREventListeners also when rayOrigin is entity, this fixes…
vincentfretin Jan 8, 2025
6a679e8
Be more explicit checking for xrselect or entity
vincentfretin Jan 10, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/components/cursor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,17 @@ module.exports.Component = registerComponent('cursor', {
},

update: function (oldData) {
if (this.data.rayOrigin === oldData.rayOrigin) { return; }
if (this.data.rayOrigin === 'entity') { this.resetRaycaster(); }
var rayOrigin = this.data.rayOrigin;
if (rayOrigin === oldData.rayOrigin) { return; }
if (rayOrigin === 'entity') { this.resetRaycaster(); }
this.updateMouseEventListeners();
// Update the WebXR event listeners if needed
if (this.data.rayOrigin === 'xrselect') {
// Update the WebXR event listeners if needed.
// This handles the cases a cursor is created or has its rayOrigin changed during an XR session.
// In the case the cursor is created before we have an active XR session, it does not add the WebXR event listeners here (addWebXREventListeners is a no-op without xrSession), upon onEnterVR they are added.
if (rayOrigin === 'xrselect' || rayOrigin === 'entity') {
this.addWebXREventListeners();
}
if (oldData.rayOrigin === 'xrselect') {
if (oldData.rayOrigin === 'xrselect' || oldData.rayOrigin === 'entity') {
this.removeWebXREventListeners();
}
},
Expand Down Expand Up @@ -445,8 +448,9 @@ module.exports.Component = registerComponent('cursor', {
},

onEnterVR: function () {
var rayOrigin = this.data.rayOrigin;
this.clearCurrentIntersection(true);
if (this.data.rayOrigin === 'xrselect') {
if (rayOrigin === 'xrselect' || rayOrigin === 'entity') {
this.addWebXREventListeners();
}
},
Expand Down
Loading