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

Merge branch 'master' of github.com:highfidelity/hifi into steady-hand-lasers

Browse source
This commit is contained in:
Seth Alves 2017-03-02 12:44:10 -08:00
commit 2047e0194d
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3290,6 +3290,7 @@ Messages.subscribe('Hifi-Hand-Disabler');
Messages.subscribe('Hifi-Hand-Grab'); Messages.subscribe('Hifi-Hand-Grab');
Messages.subscribe('Hifi-Hand-RayPick-Blacklist'); Messages.subscribe('Hifi-Hand-RayPick-Blacklist');
Messages.subscribe('Hifi-Object-Manipulation'); Messages.subscribe('Hifi-Object-Manipulation');
Messages.subscribe('Hifi-Hand-Drop');
var handleHandMessages = function(channel, message, sender) { var handleHandMessages = function(channel, message, sender) {
var data; var data;
@ -3375,6 +3376,15 @@ var handleHandMessages = function(channel, message, sender) {
} catch (e) { } catch (e) {
print("WARNING: handControllerGrab.js -- error parsing Hifi-Hand-RayPick-Blacklist message: " + message); print("WARNING: handControllerGrab.js -- error parsing Hifi-Hand-RayPick-Blacklist message: " + message);
} }
} else if (channel === 'Hifi-Hand-Drop') {
if (message === 'left') {
leftController.release();
} else if (message === 'right') {
rightController.release();
} else if (message === 'both') {
leftController.release();
rightController.release();
}
} }
} }
}; };