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

Added "Developer > Hands > Drop Without Shake" menu option

Browse source
This commit is contained in:
Anthony J. Thibault 2016-06-20 14:50:15 -07:00
parent 408f65100b
commit e5159ad213
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/system/controllers/handControllerGrab.js
View file

@ -37,6 +37,7 @@ var THUMB_ON_VALUE = 0.5;
var HAND_HEAD_MIX_RATIO = 0.0; // 0 = only use hands for search/move. 1 = only use head for search/move. var HAND_HEAD_MIX_RATIO = 0.0; // 0 = only use hands for search/move. 1 = only use head for search/move.
var PICK_WITH_HAND_RAY = true; var PICK_WITH_HAND_RAY = true;
var DROP_WITHOUT_SHAKE = false;
// //
// distant manipulation // distant manipulation
@ -1589,7 +1590,7 @@ function MyController(hand) {
print("handMove = " + this.fastHandMoveDetected + ", handIsUpsideDown = " + handIsUpsideDown); print("handMove = " + this.fastHandMoveDetected + ", handIsUpsideDown = " + handIsUpsideDown);
} }
return this.fastHandMoveDetected && handIsUpsideDown; return (DROP_WITHOUT_SHAKE || this.fastHandMoveDetected) && handIsUpsideDown;
}; };
this.nearGrabbingEnter = function() { this.nearGrabbingEnter = function() {
@ -2170,6 +2171,24 @@ function cleanup() {
leftController.cleanup(); leftController.cleanup();
Controller.disableMapping(MAPPING_NAME); Controller.disableMapping(MAPPING_NAME);
Reticle.setVisible(true); Reticle.setVisible(true);
Menu.removeMenuItem("Developer > Hands", "Drop Without Shake");
} }
Script.scriptEnding.connect(cleanup); Script.scriptEnding.connect(cleanup);
Script.update.connect(update); Script.update.connect(update);
Menu.addMenuItem({
menuName: "Developer > Hands",
menuItemName: "Drop Without Shake",
isCheckable: true,
isChecked: DROP_WITHOUT_SHAKE
});
function handleMenuItemEvent(menuItem) {
if (menuItem === "Drop Without Shake") {
DROP_WITHOUT_SHAKE = Menu.isOptionChecked("Drop Without Shake");
}
}
Menu.menuItemEvent.connect(handleMenuItemEvent);