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

Don't show proxy if tablet has been opened by other means

Browse source
This commit is contained in:
David Rowe 2018-08-10 13:10:24 +12:00
parent b240a4248d
commit 557f18f370
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
scripts/system/tabletRezzer.js
View file

@ -107,8 +107,10 @@
// #region State Machine ===================================================================================================
function enterProxyHidden() {
Overlays.deleteOverlay(proxyOverlay);
proxyOverlay = null;
if (proxyOverlay) {
Overlays.deleteOverlay(proxyOverlay);
proxyOverlay = null;
}
}
function enterProxyVisible(hand) {
@ -253,30 +255,39 @@
// Assumes that is HMD.mounted.
switch (rezzerState) {
case PROXY_HIDDEN:
// Don't show proxy is tablet is already displayed.
if (HMD.showTablet) {
break;
}
// Compare palm directions of hands with vectors from palms to camera.
if (shouldShowProxy(LEFT_HAND)) {
setState(PROXY_VISIBLE, LEFT_HAND);
break;
} else if (shouldShowProxy(RIGHT_HAND)) {
setState(PROXY_VISIBLE, RIGHT_HAND);
break;
}
break;
case PROXY_VISIBLE:
// Hide proxy if tablet has been displayed by other means.
if (HMD.showTablet) {
setState(PROXY_HIDDEN);
break;
}
// Check that palm direction of proxy hand still less than maximum angle.
if (!shouldShowProxy(proxyHand)) {
setState(PROXY_HIDDEN);
break;
}
break;
case PROXY_GRABBED:
case PROXY_EXPANDING:
break;
case TABLET_OPEN:
if (!HMD.showTablet) {
// Hide proxy if tablet has been displayed by other means.
if (HMD.showTablet) {
setState(PROXY_HIDDEN);
}
break;
case TABLET_OPEN:
// Immediately transition back to PROXY_HIDDEN.
setState(PROXY_HIDDEN);
break;
default:
error("Missing case: " + rezzerState);
}