From af749605ea6f14c8677e92d4df6b0c2341d1b7ab Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 25 Oct 2016 08:27:20 -0700 Subject: [PATCH] Update vive controller display to not hide on equip --- .../controllers/controllerDisplayManager.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/system/controllers/controllerDisplayManager.js b/scripts/system/controllers/controllerDisplayManager.js index 1ba7dda526..2c621f7e90 100644 --- a/scripts/system/controllers/controllerDisplayManager.js +++ b/scripts/system/controllers/controllerDisplayManager.js @@ -16,6 +16,8 @@ Script.include("controllerDisplay.js"); Script.include("viveControllerConfiguration.js"); +var HIDE_CONTROLLERS_ON_EQUIP = false; + // // Management of controller display // @@ -116,12 +118,14 @@ ControllerDisplayManager = function() { } } } else if (channel === 'Hifi-Object-Manipulation') { - data = JSON.parse(message); - visible = data.action !== 'equip'; - if (data.joint === "LeftHand") { - self.setLeftVisible(visible); - } else if (data.joint === "RightHand") { - self.setRightVisible(visible); + if (HIDE_CONTROLLERS_ON_EQUIP) { + data = JSON.parse(message); + visible = data.action !== 'equip'; + if (data.joint === "LeftHand") { + self.setLeftVisible(visible); + } else if (data.joint === "RightHand") { + self.setRightVisible(visible); + } } } }