From b291e32b7cd35ca73f2befeccbd1fd66f8840cac Mon Sep 17 00:00:00 2001 From: Triplelexx Date: Fri, 19 Feb 2016 13:54:13 +0000 Subject: [PATCH] update TouchscreenDevice pass inputCalibrationData to update --- libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp | 2 +- libraries/input-plugins/src/input-plugins/TouchscreenDevice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp index 788a75dc76..6abf2a9fae 100644 --- a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp +++ b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp @@ -51,7 +51,7 @@ void TouchscreenDevice::pluginUpdate(float deltaTime, bool jointsCaptured) { } } -void TouchscreenDevice::InputDevice::update(float deltaTime, bool jointsCaptured) { +void TouchscreenDevice::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) { _axisStateMap.clear(); } diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h index 8cc59c2532..568dedf7b4 100644 --- a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h +++ b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h @@ -40,7 +40,7 @@ public: virtual const QString& getName() const override { return NAME; } virtual void pluginFocusOutEvent() override { _inputDevice->focusOutEvent(); } - virtual void pluginUpdate(float deltaTime, bool jointsCaptured) override; + virtual void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) override; void touchBeginEvent(const QTouchEvent* event); void touchEndEvent(const QTouchEvent* event);