Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 04:24:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mini tablet visibility angle calculations

Browse source
This commit is contained in:
David Rowe 2018-12-06 15:24:03 +13:00
parent 363e3ca32d
commit aa952e9142
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/system/miniTablet.js
View file

@ -567,9 +567,7 @@
SHOWING_DELAY = 1000, // ms SHOWING_DELAY = 1000, // ms
lastInvisible = [0, 0], lastInvisible = [0, 0],
HIDING_DELAY = 1000, // ms HIDING_DELAY = 1000, // ms
lastVisible = [0, 0], lastVisible = [0, 0];
HALF_PI = Math.PI / 2;
function enterMiniDisabled() { function enterMiniDisabled() {
@ -608,8 +606,12 @@
handOrientation, handOrientation,
miniPosition, miniPosition,
miniToCameraDirection, miniToCameraDirection,
normalHandVector,
medialHandVector, medialHandVector,
lateralHandVector, lateralHandVector,
normalDot,
medialDot,
lateralDot,
medialAngle, medialAngle,
lateralAngle, lateralAngle,
cameraToMini, cameraToMini,
@ -664,14 +666,18 @@
miniToCameraDirection = Vec3.normalize(Vec3.subtract(Camera.position, miniPosition)); miniToCameraDirection = Vec3.normalize(Vec3.subtract(Camera.position, miniPosition));
// Mini tablet aimed toward camera? // Mini tablet aimed toward camera?
medialHandVector = Vec3.multiplyQbyV(handOrientation, Vec3.UNIT_NEG_Y); medialHandVector = Vec3.multiplyQbyV(handOrientation, Vec3.UNIT_Y);
lateralHandVector = Vec3.multiplyQbyV(handOrientation, hand === LEFT_HAND ? Vec3.UNIT_X : Vec3.UNIT_NEG_X); lateralHandVector = Vec3.multiplyQbyV(handOrientation, hand === LEFT_HAND ? Vec3.UNIT_X : Vec3.UNIT_NEG_X);
medialAngle = Math.acos(Vec3.dot(medialHandVector, miniToCameraDirection)) - HALF_PI; normalHandVector = Vec3.multiplyQbyV(handOrientation, Vec3.UNIT_Z);
lateralAngle = Math.acos(Vec3.dot(lateralHandVector, miniToCameraDirection)) - HALF_PI; medialDot = Vec3.dot(medialHandVector, miniToCameraDirection);
lateralDot = Vec3.dot(lateralHandVector, miniToCameraDirection);
normalDot = Vec3.dot(normalHandVector, miniToCameraDirection);
medialAngle = Math.atan2(medialDot, normalDot);
lateralAngle = Math.atan2(lateralDot, normalDot);
show = -MAX_MEDIAL_WRIST_CAMERA_ANGLE_RAD <= medialAngle show = -MAX_MEDIAL_WRIST_CAMERA_ANGLE_RAD <= medialAngle
&& medialAngle <= MAX_MEDIAL_FINGER_CAMERA_ANGLE_RAD && medialAngle <= MAX_MEDIAL_FINGER_CAMERA_ANGLE_RAD
&& -MAX_LATERAL_PINKY_CAMERA_ANGLE_RAD <= lateralAngle && -MAX_LATERAL_THUMB_CAMERA_ANGLE_RAD <= lateralAngle
&& lateralAngle <= MAX_LATERAL_THUMB_CAMERA_ANGLE_RAD; && lateralAngle <= MAX_LATERAL_PINKY_CAMERA_ANGLE_RAD;
// Camera looking at mini tablet? // Camera looking at mini tablet?
cameraToMini = -Vec3.dot(miniToCameraDirection, Quat.getForward(Camera.orientation)); cameraToMini = -Vec3.dot(miniToCameraDirection, Quat.getForward(Camera.orientation));