From 4a19a1468262608d8a871c2f08574eaca0b3a2ec Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Fri, 23 Oct 2015 17:53:34 -0700 Subject: [PATCH] fix walkApi.js to detect hydra in official way --- examples/libraries/walkApi.js | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/examples/libraries/walkApi.js b/examples/libraries/walkApi.js index 2a4471bfbf..8935380150 100644 --- a/examples/libraries/walkApi.js +++ b/examples/libraries/walkApi.js @@ -18,24 +18,8 @@ Script.include("./libraries/walkConstants.js"); Avatar = function() { // if Hydras are connected, the only way to enable use is to never set any arm joint rotation - this.hydraCheck = function() { - // function courtesy of Thijs Wenker (frisbee.js) - var numberOfButtons = Controller.getNumberOfButtons(); - var numberOfTriggers = Controller.getNumberOfTriggers(); - var numberOfSpatialControls = Controller.getNumberOfSpatialControls(); - const HYDRA_BUTTONS = 12; - const HYDRA_TRIGGERS = 2; - const HYDRA_CONTROLLERS_PER_TRIGGER = 2; - var controllersPerTrigger = numberOfSpatialControls / numberOfTriggers; - if (numberOfButtons == HYDRA_BUTTONS && - numberOfTriggers == HYDRA_TRIGGERS && - controllersPerTrigger == HYDRA_CONTROLLERS_PER_TRIGGER) { - print('walk.js info: Razer Hydra detected. Setting arms free (not controlled by script)'); - return true; - } else { - print('walk.js info: Razer Hydra not detected. Arms will be controlled by script.'); - return false; - } + this.hydraCheck = function () { + return Controller.Hardware.Hydra !== undefined; } // settings this.headFree = true;