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

Interim method for disabling controllerDispatcher lasers, grabbing, etc.

Browse source
This commit is contained in:
David Rowe 2017-09-14 17:21:45 +12:00
parent 299a8078e3
commit f22e2de525
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/vr-edit/vr-edit.js
View file

@ -1389,9 +1389,12 @@
updateTimer = Script.setTimeout(update, UPDATE_LOOP_TIMEOUT); updateTimer = Script.setTimeout(update, UPDATE_LOOP_TIMEOUT);
} }
function updateHandControllerGrab() { function updateControllerDispatcher() {
// Communicate app status to handControllerGrab.js. // Communicate app status to controllerDispatcher.js.
// TODO var DISABLE_HANDS = "both",
ENABLE_HANDS = "none";
// TODO: Proper method to disable specific laser and grabbing functionality.
Messages.sendLocalMessage('Hifi-Hand-Disabler', isAppActive ? DISABLE_HANDS : ENABLE_HANDS);
} }
function onUICommand(command, parameter) { function onUICommand(command, parameter) {
@ -1598,7 +1601,7 @@
} }
isAppActive = !isAppActive; isAppActive = !isAppActive;
updateHandControllerGrab(); updateControllerDispatcher();
button.editProperties({ isActive: isAppActive }); button.editProperties({ isActive: isAppActive });
if (isAppActive) { if (isAppActive) {
@ -1613,7 +1616,7 @@
var hasRezPermissions = Entities.canRez() || Entities.canRezTmp(); var hasRezPermissions = Entities.canRez() || Entities.canRezTmp();
if (isAppActive && !hasRezPermissions) { if (isAppActive && !hasRezPermissions) {
isAppActive = false; isAppActive = false;
updateHandControllerGrab(); updateControllerDispatcher();
stopApp(); stopApp();
} }
button.editProperties({ button.editProperties({
@ -1628,7 +1631,7 @@
var hasRezPermissions = Entities.canRez() || Entities.canRezTmp(); var hasRezPermissions = Entities.canRez() || Entities.canRezTmp();
if (isAppActive && !hasRezPermissions) { if (isAppActive && !hasRezPermissions) {
isAppActive = false; isAppActive = false;
updateHandControllerGrab(); updateControllerDispatcher();
stopApp(); stopApp();
} }
button.editProperties({ button.editProperties({
@ -1673,7 +1676,7 @@
// Close the app because the new avatar may have different joint numbers meaning that the UI would be attached // Close the app because the new avatar may have different joint numbers meaning that the UI would be attached
// incorrectly. Let the user reopen the app because it can take some time for the new avatar to load. // incorrectly. Let the user reopen the app because it can take some time for the new avatar to load.
isAppActive = false; isAppActive = false;
updateHandControllerGrab(); updateControllerDispatcher();
button.editProperties({ isActive: false }); button.editProperties({ isActive: false });
stopApp(); stopApp();
} }
@ -1691,7 +1694,7 @@
// Application state. // Application state.
isAppActive = false; isAppActive = false;
updateHandControllerGrab(); updateControllerDispatcher();
dominantHand = MyAvatar.getDominantHand() === "left" ? LEFT_HAND : RIGHT_HAND; dominantHand = MyAvatar.getDominantHand() === "left" ? LEFT_HAND : RIGHT_HAND;
// Tablet/toolbar button. // Tablet/toolbar button.
@ -1751,7 +1754,7 @@
MyAvatar.skeletonChanged.disconnect(onSkeletonChanged); MyAvatar.skeletonChanged.disconnect(onSkeletonChanged);
isAppActive = false; isAppActive = false;
updateHandControllerGrab(); updateControllerDispatcher();
if (button) { if (button) {
button.clicked.disconnect(onAppButtonClicked); button.clicked.disconnect(onAppButtonClicked);