Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 22:22:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

play nice with grab

Browse source
This commit is contained in:
James B. Pollack 2016-07-08 15:14:04 -07:00
parent 5ca14b528b
commit 4f899d8752
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -772,7 +772,6 @@ function MyController(hand) {
this.searchSphereOff = function() { this.searchSphereOff = function() {
if (this.searchSphere !== null) { if (this.searchSphere !== null) {
print('removing search sphere' + this.searchSphere)
Overlays.deleteOverlay(this.searchSphere); Overlays.deleteOverlay(this.searchSphere);
this.searchSphere = null; this.searchSphere = null;
this.searchSphereDistance = DEFAULT_SEARCH_SPHERE_DISTANCE; this.searchSphereDistance = DEFAULT_SEARCH_SPHERE_DISTANCE;
@ -2302,8 +2301,8 @@ mapping.from([Controller.Standard.LB]).peek().to(leftController.secondaryPress);
mapping.from([Controller.Standard.LeftGrip]).peek().to(leftController.secondaryPress); mapping.from([Controller.Standard.LeftGrip]).peek().to(leftController.secondaryPress);
mapping.from([Controller.Standard.RightGrip]).peek().to(rightController.secondaryPress); mapping.from([Controller.Standard.RightGrip]).peek().to(rightController.secondaryPress);
// mapping.from([Controller.Standard.LeftPrimaryThumb]).peek().to(leftController.thumbPress); mapping.from([Controller.Standard.LeftPrimaryThumb]).peek().to(leftController.thumbPress);
// mapping.from([Controller.Standard.RightPrimaryThumb]).peek().to(rightController.thumbPress); mapping.from([Controller.Standard.RightPrimaryThumb]).peek().to(rightController.thumbPress);
Controller.enableMapping(MAPPING_NAME); Controller.enableMapping(MAPPING_NAME);
@ -2339,12 +2338,11 @@ var handleHandMessages = function(channel, message, sender) {
handToDisable = RIGHT_HAND; handToDisable = RIGHT_HAND;
} }
if (message === "both") { if (message === "both") {
print('disable both')
leftController.turnOffVisualizations('left'); leftController.turnOffVisualizations('left');
rightController.turnOffVisualizations('right'); rightController.turnOffVisualizations('right');
} }
if (message === 'both' || message === 'none') { if (message === 'both' || message === 'none') {
// handToDisable = message; handToDisable = message;
} }
} else if (channel === 'Hifi-Hand-Grab') { } else if (channel === 'Hifi-Hand-Grab') {
try { try {