Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:49:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Persist showing mini tablet for a while after it would otherwise hide

Browse source
This commit is contained in:
David Rowe 2018-09-16 08:09:26 +12:00
parent 9d051b71bb
commit 5b3d92e816
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/system/miniTablet.js
View file

@ -565,7 +565,9 @@
MAX_CAMERA_HAND_ANGLE = 30, MAX_CAMERA_HAND_ANGLE = 30,
DEGREES_180 = 180, DEGREES_180 = 180,
MIN_HAND_CAMERA_ANGLE_COS = Math.cos(Math.PI * MIN_HAND_CAMERA_ANGLE / DEGREES_180), MIN_HAND_CAMERA_ANGLE_COS = Math.cos(Math.PI * MIN_HAND_CAMERA_ANGLE / DEGREES_180),
MAX_CAMERA_HAND_ANGLE_COS = Math.cos(Math.PI * MAX_CAMERA_HAND_ANGLE / DEGREES_180); MAX_CAMERA_HAND_ANGLE_COS = Math.cos(Math.PI * MAX_CAMERA_HAND_ANGLE / DEGREES_180),
HIDING_DELAY = 1000, // ms
lastVisible = [0, 0];
function enterMiniDisabled() { function enterMiniDisabled() {
@ -646,6 +648,7 @@
// Should show mini tablet if it would be oriented toward the camera. // Should show mini tablet if it would be oriented toward the camera.
if (show) { if (show) {
// Calculate current visibility of mini tablet.
jointIndex = handJointIndex(hand); jointIndex = handJointIndex(hand);
handPosition = Vec3.sum(MyAvatar.position, handPosition = Vec3.sum(MyAvatar.position,
Vec3.multiplyQbyV(MyAvatar.orientation, MyAvatar.getAbsoluteJointTranslationInObjectFrame(jointIndex))); Vec3.multiplyQbyV(MyAvatar.orientation, MyAvatar.getAbsoluteJointTranslationInObjectFrame(jointIndex)));
@ -660,6 +663,13 @@
show = show || (-Vec3.dot(miniToCameraDirection, Quat.getForward(handOrientation)) > MIN_HAND_CAMERA_ANGLE_COS); show = show || (-Vec3.dot(miniToCameraDirection, Quat.getForward(handOrientation)) > MIN_HAND_CAMERA_ANGLE_COS);
cameraToHand = -Vec3.dot(miniToCameraDirection, Quat.getForward(Camera.orientation)); cameraToHand = -Vec3.dot(miniToCameraDirection, Quat.getForward(Camera.orientation));
show = show && (cameraToHand > MAX_CAMERA_HAND_ANGLE_COS); show = show && (cameraToHand > MAX_CAMERA_HAND_ANGLE_COS);
// Persist showing for a while after it would otherwise be hidden.
if (show) {
lastVisible[hand] = Date.now();
} else {
show = Date.now() - lastVisible[hand] <= HIDING_DELAY;
}
} }
return { return {