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
20 20
21const QString KeyboardMouseDevice::NAME = "Keyboard/Mouse";21const QString KeyboardMouseDevice::NAME = "Keyboard/Mouse";
22 22
23void KeyboardMouseDevice::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) {23void KeyboardMouseDevice::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
24
25 auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();24 auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
26 userInputMapper->withLock([&, this]() {25 userInputMapper->withLock([&, this]() {
27 _inputDevice->update(deltaTime, inputCalibrationData, jointsCaptured);26 _inputDevice->update(deltaTime, inputCalibrationData);
28 });27 });
29 28
30 // For touch event, we need to check that the last event is not too long ago29 // 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
40 }39 }
41}40}
42 41
43void KeyboardMouseDevice::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) {42void KeyboardMouseDevice::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
44 _axisStateMap.clear();43 _axisStateMap.clear();
45}44}
46 45