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

Merge pull request #8900 from huffman/fix/disable-controller-hide-on-equip

Browse source 
Update vive controller display to not hide on equip
This commit is contained in:
Ryan Downe Karpf 2016-10-25 13:16:31 -07:00 committed by GitHub
commit 7a4302057a
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/system/controllers/controllerDisplayManager.js
View file

@ -16,6 +16,8 @@
Script.include("controllerDisplay.js"); Script.include("controllerDisplay.js");
Script.include("viveControllerConfiguration.js"); Script.include("viveControllerConfiguration.js");
var HIDE_CONTROLLERS_ON_EQUIP = false;
// //
// Management of controller display // Management of controller display
// //
@ -116,6 +118,7 @@ ControllerDisplayManager = function() {
} }
} }
} else if (channel === 'Hifi-Object-Manipulation') { } else if (channel === 'Hifi-Object-Manipulation') {
if (HIDE_CONTROLLERS_ON_EQUIP) {
data = JSON.parse(message); data = JSON.parse(message);
visible = data.action !== 'equip'; visible = data.action !== 'equip';
if (data.joint === "LeftHand") { if (data.joint === "LeftHand") {
@ -125,6 +128,7 @@ ControllerDisplayManager = function() {
} }
} }
} }
}
}; };
Messages.messageReceived.connect(handleMessages); Messages.messageReceived.connect(handleMessages);