History

Doing a pass over the input plugins and controller code

Brad Davis committed 10 years ago

Commit 07562f71 parent a73160636 files · +328 −491Browse files

Showing the changes to libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp (1 of 36 files). Show all

Unified · Split

libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp+3−4
@@ -20,11 +20,10 @@ · 19 unmodified lines
2020
2121 const QString KeyboardMouseDevice::NAME = "Keyboard/Mouse";
2222
23−void KeyboardMouseDevice::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) {
24−
23+void KeyboardMouseDevice::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
2524 auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
2625 userInputMapper->withLock([&, this]() {
27− _inputDevice->update(deltaTime, inputCalibrationData, jointsCaptured);
26+ _inputDevice->update(deltaTime, inputCalibrationData);
2827 });
2928
3029 // For touch event, we need to check that the last event is not too long ago
@@ -40,7 +39,7 @@ void KeyboardMouseDevice::pluginUpdate(float deltaTime, const controller::InputC · 9 unmodified lines
4039 }
4140 }
4241
43−void KeyboardMouseDevice::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) {
42+void KeyboardMouseDevice::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
4443 _axisStateMap.clear();
4544 }
4645