Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaning up

Browse source
This commit is contained in:
Sam Gondelman 2015-07-22 18:17:06 -07:00
parent fe632e13b2
commit 20c736dd5d
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
View file

@ -376,7 +376,6 @@ void ViveControllerManager::registerToUserInputMapper(UserInputMapper& mapper) {
void ViveControllerManager::assignDefaultInputMapping(UserInputMapper& mapper) { void ViveControllerManager::assignDefaultInputMapping(UserInputMapper& mapper) {
const float JOYSTICK_MOVE_SPEED = 1.0f; const float JOYSTICK_MOVE_SPEED = 1.0f;
const float BOOM_SPEED = 0.1f;
// Left Trackpad: Movement, strafing // Left Trackpad: Movement, strafing
mapper.addInputChannel(UserInputMapper::LONGITUDINAL_FORWARD, makeInput(AXIS_Y_POS, 0), makeInput(TRACKPAD_BUTTON, 0), JOYSTICK_MOVE_SPEED); mapper.addInputChannel(UserInputMapper::LONGITUDINAL_FORWARD, makeInput(AXIS_Y_POS, 0), makeInput(TRACKPAD_BUTTON, 0), JOYSTICK_MOVE_SPEED);

4
libraries/input-plugins/src/input-plugins/ViveControllerManager.h
View file

@ -88,11 +88,11 @@ private:
model::Geometry _modelGeometry; model::Geometry _modelGeometry;
gpu::TexturePointer _texture; gpu::TexturePointer _texture;
bool _renderControllers;
int _leftHandRenderID; int _leftHandRenderID;
int _rightHandRenderID; int _rightHandRenderID;
bool _renderControllers;
static const QString NAME; static const QString NAME;
}; };