From 20c736dd5d91e7272e722c826d4843bb77e03f9f Mon Sep 17 00:00:00 2001 From: Sam Gondelman Date: Wed, 22 Jul 2015 18:17:06 -0700 Subject: [PATCH] cleaning up --- .../input-plugins/src/input-plugins/ViveControllerManager.cpp | 1 - .../input-plugins/src/input-plugins/ViveControllerManager.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp index 5b11801dd5..f7b35305b2 100644 --- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp +++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp @@ -376,7 +376,6 @@ void ViveControllerManager::registerToUserInputMapper(UserInputMapper& mapper) { void ViveControllerManager::assignDefaultInputMapping(UserInputMapper& mapper) { const float JOYSTICK_MOVE_SPEED = 1.0f; - const float BOOM_SPEED = 0.1f; // Left Trackpad: Movement, strafing mapper.addInputChannel(UserInputMapper::LONGITUDINAL_FORWARD, makeInput(AXIS_Y_POS, 0), makeInput(TRACKPAD_BUTTON, 0), JOYSTICK_MOVE_SPEED); diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.h b/libraries/input-plugins/src/input-plugins/ViveControllerManager.h index 78f6024ba1..251343cd2b 100644 --- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.h +++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.h @@ -88,11 +88,11 @@ private: model::Geometry _modelGeometry; gpu::TexturePointer _texture; - bool _renderControllers; - int _leftHandRenderID; int _rightHandRenderID; + bool _renderControllers; + static const QString NAME; };