Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 20:17:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use half angles relative to palm normal for mini tablet visibility

Browse source
This commit is contained in:
David Rowe 2018-11-02 18:06:00 +13:00
parent 1e3549d263
commit 8924f0832a
1 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
scripts/system/miniTablet.js
View file

@ -250,11 +250,8 @@
} }
function getUIPositionAndRotation(hand) { function getUIPosition(hand) {
return { return MINI_POSITIONS[hand];
position: MINI_POSITIONS[hand],
rotation: MINI_ROTATIONS[hand]
};
} }
function getMiniTabletID() { function getMiniTabletID() {
@ -492,7 +489,7 @@
create(); create();
return { return {
getUIPositionAndRotation: getUIPositionAndRotation, getUIPosition: getUIPosition,
getMiniTabletID: getMiniTabletID, getMiniTabletID: getMiniTabletID,
getMiniTabletProperties: getMiniTabletProperties, getMiniTabletProperties: getMiniTabletProperties,
isLaserPointingAt: isLaserPointingAt, isLaserPointingAt: isLaserPointingAt,
@ -554,13 +551,22 @@
MAX_TRIGGER_ON_TIME = 400, MAX_TRIGGER_ON_TIME = 400,
// Visibility. // Visibility.
MAX_HAND_CAMERA_ANGLE = 30, MAX_MEDIAL_FINGER_CAMERA_ANGLE = 25, // From palm normal along palm towards fingers.
MAX_CAMERA_HAND_ANGLE = 30, MAX_MEDIAL_WRIST_CAMERA_ANGLE = 65, // From palm normal along palm towards wrist.
MAX_LATERAL_THUMB_CAMERA_ANGLE = 25, // From palm normal across palm towards of thumb.
MAX_LATERAL_PINKY_CAMERA_ANGLE = 25, // From palm normal across palm towards pinky.
DEGREES_180 = 180, DEGREES_180 = 180,
MAX_HAND_CAMERA_ANGLE_COS = Math.cos(Math.PI * MAX_HAND_CAMERA_ANGLE / DEGREES_180), DEGREES_TO_RADIANS = Math.PI / DEGREES_180,
MAX_CAMERA_HAND_ANGLE_COS = Math.cos(Math.PI * MAX_CAMERA_HAND_ANGLE / DEGREES_180), MAX_MEDIAL_FINGER_CAMERA_ANGLE_RAD = DEGREES_TO_RADIANS * MAX_MEDIAL_FINGER_CAMERA_ANGLE,
MAX_MEDIAL_WRIST_CAMERA_ANGLE_RAD = DEGREES_TO_RADIANS * MAX_MEDIAL_WRIST_CAMERA_ANGLE,
MAX_LATERAL_THUMB_CAMERA_ANGLE_RAD = DEGREES_TO_RADIANS * MAX_LATERAL_THUMB_CAMERA_ANGLE,
MAX_LATERAL_PINKY_CAMERA_ANGLE_RAD = DEGREES_TO_RADIANS * MAX_LATERAL_PINKY_CAMERA_ANGLE,
MAX_CAMERA_MINI_ANGLE = 30,
MAX_CAMERA_MINI_ANGLE_COS = Math.cos(MAX_CAMERA_MINI_ANGLE * DEGREES_TO_RADIANS),
HIDING_DELAY = 1000, // ms HIDING_DELAY = 1000, // ms
lastVisible = [0, 0]; lastVisible = [0, 0],
HALF_PI = Math.PI / 2;
function enterMiniDisabled() { function enterMiniDisabled() {
@ -597,11 +603,13 @@
jointIndex, jointIndex,
handPosition, handPosition,
handOrientation, handOrientation,
uiPositionAndOrientation,
miniPosition, miniPosition,
miniOrientation,
miniToCameraDirection, miniToCameraDirection,
cameraToHand; medialHandVector,
lateralHandVector,
medialAngle,
lateralAngle,
cameraToMini;
// Shouldn't show mini tablet if hand isn't being controlled. // Shouldn't show mini tablet if hand isn't being controlled.
pose = Controller.getPoseValue(hand === LEFT_HAND ? Controller.Standard.LeftHand : Controller.Standard.RightHand); pose = Controller.getPoseValue(hand === LEFT_HAND ? Controller.Standard.LeftHand : Controller.Standard.RightHand);
@ -646,15 +654,24 @@
Vec3.multiplyQbyV(MyAvatar.orientation, MyAvatar.getAbsoluteJointTranslationInObjectFrame(jointIndex))); Vec3.multiplyQbyV(MyAvatar.orientation, MyAvatar.getAbsoluteJointTranslationInObjectFrame(jointIndex)));
handOrientation = handOrientation =
Quat.multiply(MyAvatar.orientation, MyAvatar.getAbsoluteJointRotationInObjectFrame(jointIndex)); Quat.multiply(MyAvatar.orientation, MyAvatar.getAbsoluteJointRotationInObjectFrame(jointIndex));
uiPositionAndOrientation = ui.getUIPositionAndRotation(hand); var uiPosition = ui.getUIPosition(hand);
miniPosition = Vec3.sum(handPosition, Vec3.multiply(MyAvatar.sensorToWorldScale, miniPosition = Vec3.sum(handPosition, Vec3.multiply(MyAvatar.sensorToWorldScale,
Vec3.multiplyQbyV(handOrientation, uiPositionAndOrientation.position))); Vec3.multiplyQbyV(handOrientation, uiPosition)));
miniOrientation = Quat.multiply(handOrientation, uiPositionAndOrientation.rotation);
miniToCameraDirection = Vec3.normalize(Vec3.subtract(Camera.position, miniPosition)); miniToCameraDirection = Vec3.normalize(Vec3.subtract(Camera.position, miniPosition));
show = Vec3.dot(miniToCameraDirection, Quat.getForward(miniOrientation)) > MAX_HAND_CAMERA_ANGLE_COS;
show = show || (-Vec3.dot(miniToCameraDirection, Quat.getForward(handOrientation)) > MAX_HAND_CAMERA_ANGLE_COS); // Mini tablet aimed toward camera?
cameraToHand = -Vec3.dot(miniToCameraDirection, Quat.getForward(Camera.orientation)); medialHandVector = Vec3.multiplyQbyV(handOrientation, Vec3.UNIT_NEG_Y);
show = show && (cameraToHand > MAX_CAMERA_HAND_ANGLE_COS); lateralHandVector = Vec3.multiplyQbyV(handOrientation, hand === LEFT_HAND ? Vec3.UNIT_X : Vec3.UNIT_NEG_X);
medialAngle = Math.acos(Vec3.dot(medialHandVector, miniToCameraDirection)) - HALF_PI;
lateralAngle = Math.acos(Vec3.dot(lateralHandVector, miniToCameraDirection)) - HALF_PI;
show = -MAX_MEDIAL_WRIST_CAMERA_ANGLE_RAD <= medialAngle
&& medialAngle <= MAX_MEDIAL_FINGER_CAMERA_ANGLE_RAD
&& -MAX_LATERAL_PINKY_CAMERA_ANGLE_RAD <= lateralAngle
&& lateralAngle <= MAX_LATERAL_THUMB_CAMERA_ANGLE_RAD;
// Camera looking at mini tablet?
cameraToMini = -Vec3.dot(miniToCameraDirection, Quat.getForward(Camera.orientation));
show = show && (cameraToMini > MAX_CAMERA_MINI_ANGLE_COS);
// Persist showing for a while after it would otherwise be hidden. // Persist showing for a while after it would otherwise be hidden.
if (show) { if (show) {
@ -666,7 +683,7 @@
return { return {
show: show, show: show,
cameraToHand: cameraToHand cameraToMini: cameraToMini
}; };
} }
@ -689,7 +706,7 @@
showRight = shouldShowMini(RIGHT_HAND); showRight = shouldShowMini(RIGHT_HAND);
if (showLeft.show && showRight.show) { if (showLeft.show && showRight.show) {
// Both hands would be pointing at camera; show the one the camera is gazing at. // Both hands would be pointing at camera; show the one the camera is gazing at.
if (showLeft.cameraToHand > showRight.cameraToHand) { if (showLeft.cameraToMini > showRight.cameraToMini) {
setState(MINI_SHOWING, LEFT_HAND); setState(MINI_SHOWING, LEFT_HAND);
} else { } else {
setState(MINI_SHOWING, RIGHT_HAND); setState(MINI_SHOWING, RIGHT_HAND);
@ -751,7 +768,7 @@
showLeft = shouldShowMini(LEFT_HAND); showLeft = shouldShowMini(LEFT_HAND);
showRight = shouldShowMini(RIGHT_HAND); showRight = shouldShowMini(RIGHT_HAND);
if (showLeft.show && showRight.show) { if (showLeft.show && showRight.show) {
if (showLeft.cameraToHand > showRight.cameraToHand) { if (showLeft.cameraToMini > showRight.cameraToMini) {
if (miniHand !== LEFT_HAND) { if (miniHand !== LEFT_HAND) {
setState(MINI_HIDING); setState(MINI_HIDING);
} }