From dcaa29477880e08e6dcfc4be5773627d1f1b080a Mon Sep 17 00:00:00 2001 From: Sam Gondelman Date: Wed, 8 Jul 2015 13:38:43 -0700 Subject: [PATCH] removed vive zooming --- .../input-plugins/src/input-plugins/ViveControllerManager.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp index b7ee7d5775..93ec942f24 100644 --- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp +++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp @@ -236,8 +236,6 @@ void ViveControllerManager::assignDefaultInputMapping(UserInputMapper& mapper) { // Right Trackpad: Vertical movement, zooming mapper.addInputChannel(UserInputMapper::VERTICAL_UP, makeInput(AXIS_Y_POS, 1), makeInput(TRACKPAD_BUTTON, 1), JOYSTICK_MOVE_SPEED); mapper.addInputChannel(UserInputMapper::VERTICAL_DOWN, makeInput(AXIS_Y_NEG, 1), makeInput(TRACKPAD_BUTTON, 1), JOYSTICK_MOVE_SPEED); - mapper.addInputChannel(UserInputMapper::BOOM_IN, makeInput(AXIS_X_POS, 1), makeInput(TRACKPAD_BUTTON, 1), BOOM_SPEED); - mapper.addInputChannel(UserInputMapper::BOOM_OUT, makeInput(AXIS_X_NEG, 1), makeInput(TRACKPAD_BUTTON, 1), BOOM_SPEED); // Buttons mapper.addInputChannel(UserInputMapper::SHIFT, makeInput(GRIP_BUTTON, 0));