From 9be8d1edf94ac4bf9417d5581817cfc4836b725e Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 3 Nov 2015 11:44:33 -0800 Subject: [PATCH] Remove now unecessary vive hack --- .../src/input-plugins/ViveControllerManager.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp index b083d06a2a..fb0021d7d5 100644 --- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp +++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp @@ -285,13 +285,7 @@ void ViveControllerManager::update(float deltaTime, bool jointsCaptured) { handleButtonEvent(i, pressed, left); } for (uint32_t i = 0; i < vr::k_unControllerStateAxisCount; i++) { - auto mask = vr::ButtonMaskFromId((vr::EVRButtonId)(i + vr::k_EButton_Axis0)); - bool pressed = 0 != (controllerState.ulButtonPressed & mask); - if (pressed || true) { - handleAxisEvent(i, controllerState.rAxis[i].x, controllerState.rAxis[i].y, left); - } else { - handleAxisEvent(i, 0.0f, 0.0f, left); - } + handleAxisEvent(i, controllerState.rAxis[i].x, controllerState.rAxis[i].y, left); } } }