History

switched vive buttons

SamGondelman committed 11 years ago

Commit 8bbdfd41 parent b2e18b51 file · +4 −4Browse files

Showing the changes to libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp (1 of 1 file). Show all

Unified · Split

libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp+4−4
@@ -388,11 +388,11 @@ void ViveControllerManager::assignDefaultInputMapping(UserInputMapper& mapper) { · 387 unmodified lines
388 mapper.addInputChannel(UserInputMapper::VERTICAL_DOWN, makeInput(AXIS_Y_NEG, 1), makeInput(TRACKPAD_BUTTON, 1), JOYSTICK_MOVE_SPEED);388 mapper.addInputChannel(UserInputMapper::VERTICAL_DOWN, makeInput(AXIS_Y_NEG, 1), makeInput(TRACKPAD_BUTTON, 1), JOYSTICK_MOVE_SPEED);
389 389
390 // Buttons390 // Buttons
391 mapper.addInputChannel(UserInputMapper::SHIFT, makeInput(GRIP_BUTTON, 0));391 mapper.addInputChannel(UserInputMapper::SHIFT, makeInput(BUTTON_A, 0));
392 mapper.addInputChannel(UserInputMapper::SHIFT, makeInput(GRIP_BUTTON, 1));392 mapper.addInputChannel(UserInputMapper::SHIFT, makeInput(BUTTON_A, 1));
393 393
394 mapper.addInputChannel(UserInputMapper::ACTION1, makeInput(BUTTON_A, 0));394 mapper.addInputChannel(UserInputMapper::ACTION1, makeInput(GRIP_BUTTON, 0));
395 mapper.addInputChannel(UserInputMapper::ACTION2, makeInput(BUTTON_A, 1));395 mapper.addInputChannel(UserInputMapper::ACTION2, makeInput(GRIP_BUTTON, 1));
396 396
397 mapper.addInputChannel(UserInputMapper::LEFT_HAND_CLICK, makeInput(TRIGGER_BUTTON, 0));397 mapper.addInputChannel(UserInputMapper::LEFT_HAND_CLICK, makeInput(TRIGGER_BUTTON, 0));
398 mapper.addInputChannel(UserInputMapper::RIGHT_HAND_CLICK, makeInput(TRIGGER_BUTTON, 1));398 mapper.addInputChannel(UserInputMapper::RIGHT_HAND_CLICK, makeInput(TRIGGER_BUTTON, 1));