From 742f741095712595b3e318f33a8d80a60781eaea Mon Sep 17 00:00:00 2001 From: Triplelexx Date: Sun, 21 Feb 2016 21:27:21 +0000 Subject: [PATCH] update TouchscreenDevice again added passing of inputCalibrationData missed from last commit --- .../input-plugins/src/input-plugins/TouchscreenDevice.cpp | 4 ++-- libraries/input-plugins/src/input-plugins/TouchscreenDevice.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp index 6abf2a9fae..8fb1f6bd0a 100644 --- a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp +++ b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp @@ -22,8 +22,8 @@ const QString TouchscreenDevice::NAME = "Touchscreen"; -void TouchscreenDevice::pluginUpdate(float deltaTime, bool jointsCaptured) { - _inputDevice->update(deltaTime, jointsCaptured); +void TouchscreenDevice::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) { + _inputDevice->update(deltaTime, inputCalibrationData, jointsCaptured); // at DPI 100 use these arbitrary values to divide dragging distance static const float DPI_SCALE_X = glm::clamp((float)(qApp->primaryScreen()->physicalDotsPerInchX() / 100.0f), 1.0f, 10.0f) diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h index 568dedf7b4..acd7d89333 100644 --- a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h +++ b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h @@ -58,7 +58,7 @@ protected: // Device functions virtual controller::Input::NamedVector getAvailableInputs() const override; virtual QString getDefaultMappingConfig() const override; - virtual void update(float deltaTime, bool jointsCaptured) override; + virtual void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) override; virtual void focusOutEvent() override; controller::Input makeInput(TouchAxisChannel axis) const;