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

don't oscillate hands when both triggers are pulled.

Browse source
This commit is contained in:
howard-stearns 2016-04-29 13:54:02 -07:00
parent b3fda55ea9
commit b05bbdd041
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/controllers/handControllerPointer.js
View file

@ -13,8 +13,6 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
print('handControllerPointer version', 10);
// Control the "mouse" using hand controller. (HMD and desktop.) // Control the "mouse" using hand controller. (HMD and desktop.)
// For now: // For now:
// Thumb utton 3 is left-mouse, button 4 is right-mouse. What to do on Vive? (Currently primary thumb is left click.) // Thumb utton 3 is left-mouse, button 4 is right-mouse. What to do on Vive? (Currently primary thumb is left click.)
@ -314,13 +312,16 @@ checkHardware();
var activeHand = Controller.Standard.RightHand; var activeHand = Controller.Standard.RightHand;
var activeTrigger = rightTrigger; var activeTrigger = rightTrigger;
var inactiveTrigger = leftTrigger;
function toggleHand() { function toggleHand() {
if (activeHand === Controller.Standard.RightHand) { if (activeHand === Controller.Standard.RightHand) {
activeHand = Controller.Standard.LeftHand; activeHand = Controller.Standard.LeftHand;
activeTrigger = leftTrigger; activeTrigger = leftTrigger;
inactiveTrigger = rightTrigger;
} else { } else {
activeHand = Controller.Standard.RightHand; activeHand = Controller.Standard.RightHand;
activeTrigger = rightTrigger; activeTrigger = rightTrigger;
inactiveTrigger = leftTrigger;
} }
} }
@ -389,7 +390,7 @@ function update() {
rightTrigger.updateSmoothedTrigger(); rightTrigger.updateSmoothedTrigger();
if (!handControllerLockOut.expired(now)) { return turnOffVisualization(); } // Let them use mouse it in peace. if (!handControllerLockOut.expired(now)) { return turnOffVisualization(); } // Let them use mouse it in peace.
if (activeTrigger.triggerSmoothedSqueezed()) { toggleHand(); } if (activeTrigger.triggerSmoothedSqueezed() && !inactiveTrigger.triggerSmoothedSqueezed()) { toggleHand(); }
if (!Menu.isOptionChecked("First Person")) { return turnOffVisualization(); } // What to do? menus can be behind hand! if (!Menu.isOptionChecked("First Person")) { return turnOffVisualization(); } // What to do? menus can be behind hand!
var controllerPose = getControllerPose(activeHand); var controllerPose = getControllerPose(activeHand);