Showing the changes to interface/src/ui/UserInputMapper.cpp (1 of 1 file). Show all
Unified · Split
| @@ -131,7 +131,7 @@ void KeyboardMouseDevice::registerToUserInputMapper(UserInputMapper& mapper) { · 130 unmodified lines | ||
| 131 | 131 | void KeyboardMouseDevice::assignDefaultInputMapping(UserInputMapper& mapper) { |
| 132 | 132 | const float BUTTON_MOVE_SPEED = 1.0f; |
| 133 | 133 | const float BUTTON_ROTATION_SPEED = 30.0f; |
| 134 | − const float MOUSE_ROTATION_SPEED = 0.25f; | |
| 134 | + const float MOUSE_ROTATION_SPEED = 1.0f; | |
| 135 | 135 | const float BUTTON_BOOM_SPEED = 0.1f; |
| 136 | 136 | |
| 137 | 137 | // AWSD keys mapping |
| @@ -142,8 +142,8 @@ void KeyboardMouseDevice::assignDefaultInputMapping(UserInputMapper& mapper) { · 4 unmodified lines | ||
| 142 | 142 | mapper.addInputChannel(UserInputMapper::VERTICAL_DOWN, makeInput(Qt::Key_C), BUTTON_MOVE_SPEED); |
| 143 | 143 | mapper.addInputChannel(UserInputMapper::VERTICAL_UP, makeInput(Qt::Key_E), BUTTON_MOVE_SPEED); |
| 144 | 144 | |
| 145 | − mapper.addInputChannel(UserInputMapper::BOOM_IN, makeInput(Qt::Key_W), makeInput(Qt::Key_Shift), BUTTON_BOOM_SPEED); | |
| 146 | − mapper.addInputChannel(UserInputMapper::BOOM_OUT, makeInput(Qt::Key_S), makeInput(Qt::Key_Shift), BUTTON_BOOM_SPEED); | |
| 145 | + // mapper.addInputChannel(UserInputMapper::BOOM_IN, makeInput(Qt::Key_W), makeInput(Qt::Key_Shift), BUTTON_BOOM_SPEED); | |
| 146 | + // mapper.addInputChannel(UserInputMapper::BOOM_OUT, makeInput(Qt::Key_S), makeInput(Qt::Key_Shift), BUTTON_BOOM_SPEED); | |
| 147 | 147 | mapper.addInputChannel(UserInputMapper::YAW_LEFT, makeInput(Qt::Key_A), makeInput(Qt::Key_Shift), BUTTON_ROTATION_SPEED); |
| 148 | 148 | mapper.addInputChannel(UserInputMapper::YAW_RIGHT, makeInput(Qt::Key_D), makeInput(Qt::Key_Shift), BUTTON_ROTATION_SPEED); |
| 149 | 149 | mapper.addInputChannel(UserInputMapper::PITCH_DOWN, makeInput(Qt::Key_C), makeInput(Qt::Key_Shift), BUTTON_ROTATION_SPEED); |
| @@ -157,12 +157,12 @@ void KeyboardMouseDevice::assignDefaultInputMapping(UserInputMapper& mapper) { · 7 unmodified lines | ||
| 157 | 157 | mapper.addInputChannel(UserInputMapper::VERTICAL_DOWN, makeInput(Qt::Key_PageDown), BUTTON_MOVE_SPEED); |
| 158 | 158 | mapper.addInputChannel(UserInputMapper::VERTICAL_UP, makeInput(Qt::Key_PageUp), BUTTON_MOVE_SPEED); |
| 159 | 159 | |
| 160 | − mapper.addInputChannel(UserInputMapper::BOOM_IN, makeInput(Qt::Key_Up), makeInput(Qt::Key_Shift), BUTTON_BOOM_SPEED); | |
| 161 | − mapper.addInputChannel(UserInputMapper::BOOM_OUT, makeInput(Qt::Key_Down), makeInput(Qt::Key_Shift), BUTTON_BOOM_SPEED); | |
| 160 | + // mapper.addInputChannel(UserInputMapper::BOOM_IN, makeInput(Qt::Key_Up), makeInput(Qt::Key_Shift), BUTTON_BOOM_SPEED); | |
| 161 | + // mapper.addInputChannel(UserInputMapper::BOOM_OUT, makeInput(Qt::Key_Down), makeInput(Qt::Key_Shift), BUTTON_BOOM_SPEED); | |
| 162 | 162 | mapper.addInputChannel(UserInputMapper::YAW_LEFT, makeInput(Qt::Key_Left), makeInput(Qt::Key_Shift), BUTTON_ROTATION_SPEED); |
| 163 | 163 | mapper.addInputChannel(UserInputMapper::YAW_RIGHT, makeInput(Qt::Key_Right), makeInput(Qt::Key_Shift), BUTTON_ROTATION_SPEED); |
| 164 | − mapper.addInputChannel(UserInputMapper::PITCH_DOWN, makeInput(Qt::Key_PageDown), makeInput(Qt::Key_Shift), BUTTON_ROTATION_SPEED); | |
| 165 | − mapper.addInputChannel(UserInputMapper::PITCH_UP, makeInput(Qt::Key_PageUp), makeInput(Qt::Key_Shift), BUTTON_ROTATION_SPEED); | |
| 164 | + mapper.addInputChannel(UserInputMapper::PITCH_DOWN, makeInput(Qt::Key_Down), makeInput(Qt::Key_Shift), BUTTON_ROTATION_SPEED); | |
| 165 | + mapper.addInputChannel(UserInputMapper::PITCH_UP, makeInput(Qt::Key_Up), makeInput(Qt::Key_Shift), BUTTON_ROTATION_SPEED); | |
| 166 | 166 | |
| 167 | 167 | // Mouse move |
| 168 | 168 | mapper.addInputChannel(UserInputMapper::PITCH_DOWN, makeInput(MOUSE_AXIS_Y_NEG), makeInput(Qt::RightButton), MOUSE_ROTATION_SPEED); |