Skip to content
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

Jump to bottom

ar-hit-test: uses 1st tracked controller instead of headset orientation #5308

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

ar-hit-test: uses 1st tracked controller instead of headset orientation #5308

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae259f1
ar-hit-test: uses first tracked controller instead of headset orienta…
DougReeder Jun 14, 2023
fa6e570
Removes headset HitTest when controller HitTest created
DougReeder Jun 20, 2023
b595f4a
ar-hit-test: saves controller HitTest to cache
DougReeder Jun 20, 2023
6ede1ff
ar-hit-test: fixes bug #5315: when selectend happens before the retic…
DougReeder Jun 21, 2023
3fe22f9
ar-hit-test: catches errors while updating anchor poses
DougReeder Jun 23, 2023
805e671
ar-hit-test: fixes bug: previous anchors now actually saved
DougReeder Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 39 additions & 17 deletions src/components/scene/ar-hit-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ HitTest.prototype.sessionStart = function sessionStart (hitTestSourceDetails) {
};

/**
* Turns the last hit test into an anchor, the provided Object3D will have it's
* Turns the last hit test into an anchor, the provided Object3D will have its
* position update to track the anchor.
*
* @param {Object3D} object3D object to track
Expand Down Expand Up @@ -190,18 +190,19 @@ HitTest.updateAnchorPoses = function (frame, refSpace) {
try {
// Query most recent pose of the anchor relative to some reference space:
anchorPose = frame.getPose(anchor.anchorSpace, refSpace);
} catch (e) {
// This will fail if the anchor has been deleted that frame
}

if (anchorPose) {
object3DOptions = HitTest.prototype.anchorToObject3D.get(anchor);
offset = object3DOptions.offset;
object3D = object3DOptions.object3D;
if (anchorPose) {
object3DOptions = HitTest.prototype.anchorToObject3D.get(anchor);
offset = object3DOptions.offset;
object3D = object3DOptions.object3D;

applyPose(anchorPose, object3D, offset);
applyPose(anchorPose, object3D, offset);
}
} catch (e) {
console.error('while updating anchor poses:', e);
}
});
HitTest.prototype.previousFrameAnchors = trackedAnchors;
};

var hitTestCache;
Expand Down Expand Up @@ -283,16 +284,37 @@ module.exports.Component = register('ar-hit-test', {
// Default to selecting through the face
session.requestReferenceSpace('viewer')
.then(function (viewerSpace) {
this.hitTest = new HitTest(renderer, {
this.viewerHitTest = this.hitTest = new HitTest(renderer, {
space: viewerSpace
});

hitTestCache.set(viewerSpace, this.hitTest);

this.el.emit('ar-hit-test-start');
}.bind(this));

// These are transient inputs so need to be handled seperately
// If a tracked controller is available, selects via that instead of the headset
var arHitTestComp = this;
this.el.sceneEl.addEventListener('controllersupdated', function () {
var sceneEl = this;
var inputSources = sceneEl.xrSession && sceneEl.xrSession.inputSources;
if (!inputSources) { return; }
for (var i = 0; i < inputSources.length; ++i) {
if (inputSources[i].targetRayMode === 'tracked-pointer') {
arHitTestComp.hitTest = new HitTest(renderer, {
space: inputSources[i].targetRaySpace
});
hitTestCache.set(inputSources[i], arHitTestComp.hitTest);

if (arHitTestComp.viewerHitTest && typeof arHitTestComp.viewerHitTest.cancel === 'function') {
arHitTestComp.viewerHitTest.cancel();
arHitTestComp.viewerHitTest = null;
}

break; // only uses first tracked controller
}
}
});

// These are transient inputs so need to be handled separately
var profileToSupport = 'generic-touchscreen';
var transientHitTest = new HitTest(renderer, {
profile: profileToSupport
Expand Down Expand Up @@ -345,7 +367,7 @@ module.exports.Component = register('ar-hit-test', {
applyPose(applyPose.tempFakePose, object, this.bboxOffset);
object.visible = true;

// create an anchor attatched to the object
// create an anchor attached to the object
this.hitTest.anchorFromLastHitTestResult(object, this.bboxOffset);
}
}
Expand All @@ -355,9 +377,9 @@ module.exports.Component = register('ar-hit-test', {
position: this.bboxMesh.position,
orientation: this.bboxMesh.quaternion
});
}

this.hitTest = null;
this.hitTest = null;
}
}.bind(this));
}.bind(this));

Expand Down Expand Up @@ -449,7 +471,7 @@ module.exports.Component = register('ar-hit-test', {
var renderer = this.el.sceneEl.renderer;

if (frame) {
// if we are in XR then update the positions of the objects attatched to anchors
// if we are in XR then update the positions of the objects attached to anchors
HitTest.updateAnchorPoses(frame, renderer.xr.getReferenceSpace());
}
if (this.bboxNeedsUpdate) {
Expand Down