Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 18:15:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8094 from howard-stearns/fix-depth-request

Browse source 
fix depth request
This commit is contained in:
Howard Stearns 2016-06-17 13:26:07 -07:00 committed by GitHub
commit aeebe8b3fb
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/system/controllers/handControllerPointer.js
View file

@ -153,9 +153,8 @@ function isPointingAtOverlay(optionalHudPosition2d) {
} }
// Generalized HUD utilities, with or without HMD: // Generalized HUD utilities, with or without HMD:
// These two "vars" are for documentation. Do not change their values! // This "var" is for documentation. Do not change the value!
var SPHERICAL_HUD_DISTANCE = 1; // meters. var PLANAR_PERPENDICULAR_HUD_DISTANCE = 1;
var PLANAR_PERPENDICULAR_HUD_DISTANCE = SPHERICAL_HUD_DISTANCE;
function calculateRayUICollisionPoint(position, direction) { function calculateRayUICollisionPoint(position, direction) {
// Answer the 3D intersection of the HUD by the given ray, or falsey if no intersection. // Answer the 3D intersection of the HUD by the given ray, or falsey if no intersection.
if (HMD.active) { if (HMD.active) {
@ -274,6 +273,11 @@ function expireMouseCursor(now) {
Reticle.visible = false; Reticle.visible = false;
} }
} }
function hudReticleDistance() { // 3d distance from camera to the reticle position on hud
// (The camera is only in the center of the sphere on reset.)
var reticlePositionOnHUD = HMD.worldPointFromOverlay(Reticle.position);
return Vec3.distance(reticlePositionOnHUD, HMD.position);
}
function onMouseMove() { function onMouseMove() {
// Display cursor at correct depth (as in depthReticle.js), and updateMouseActivity. // Display cursor at correct depth (as in depthReticle.js), and updateMouseActivity.
if (ignoreMouseActivity()) { if (ignoreMouseActivity()) {
@ -283,11 +287,10 @@ function onMouseMove() {
if (HMD.active) { // set depth if (HMD.active) { // set depth
updateSeeking(); updateSeeking();
if (isPointingAtOverlay()) { if (isPointingAtOverlay()) {
Reticle.setDepth(SPHERICAL_HUD_DISTANCE); // NOT CORRECT IF WE SWITCH TO OFFSET SPHERE! Reticle.depth = hudReticleDistance();
} else { } else {
var result = findRayIntersection(Camera.computePickRay(Reticle.position.x, Reticle.position.y)); var result = findRayIntersection(Camera.computePickRay(Reticle.position.x, Reticle.position.y));
var depth = result.intersects ? result.distance : APPARENT_MAXIMUM_DEPTH; Reticle.depth = result.intersects ? result.distance : APPARENT_MAXIMUM_DEPTH;
Reticle.setDepth(depth);
} }
} }
updateMouseActivity(); // After the above, just in case the depth movement is awkward when becoming visible. updateMouseActivity(); // After the above, just in case the depth movement is awkward when becoming visible.
@ -493,8 +496,8 @@ function update() {
setReticlePosition(hudPoint2d); setReticlePosition(hudPoint2d);
// If there's a HUD element at the (newly moved) reticle, just make it visible and bail. // If there's a HUD element at the (newly moved) reticle, just make it visible and bail.
if (isPointingAtOverlay(hudPoint2d)) { if (isPointingAtOverlay(hudPoint2d)) {
if (HMD.active) { // Doesn't hurt anything without the guard, but consider it documentation. if (HMD.active) {
Reticle.depth = SPHERICAL_HUD_DISTANCE; // NOT CORRECT IF WE SWITCH TO OFFSET SPHERE! Reticle.depth = hudReticleDistance();
} }
return turnOffVisualization(true); return turnOffVisualization(true);
} }