Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

update TouchscreenDevice again

Browse source 
added passing of inputCalibrationData missed from last commit
This commit is contained in:
Triplelexx 2016-02-21 21:27:21 +00:00
parent b291e32b7c
commit 742f741095
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/input-plugins/src/input-plugins/TouchscreenDevice.cpp
View file

@ -22,8 +22,8 @@
const QString TouchscreenDevice::NAME = "Touchscreen"; const QString TouchscreenDevice::NAME = "Touchscreen";
void TouchscreenDevice::pluginUpdate(float deltaTime, bool jointsCaptured) { void TouchscreenDevice::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) {
_inputDevice->update(deltaTime, jointsCaptured); _inputDevice->update(deltaTime, inputCalibrationData, jointsCaptured);
// at DPI 100 use these arbitrary values to divide dragging distance // 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) static const float DPI_SCALE_X = glm::clamp((float)(qApp->primaryScreen()->physicalDotsPerInchX() / 100.0f), 1.0f, 10.0f)

2
libraries/input-plugins/src/input-plugins/TouchscreenDevice.h
View file

@ -58,7 +58,7 @@ protected:
// Device functions // Device functions
virtual controller::Input::NamedVector getAvailableInputs() const override; virtual controller::Input::NamedVector getAvailableInputs() const override;
virtual QString getDefaultMappingConfig() 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; virtual void focusOutEvent() override;
controller::Input makeInput(TouchAxisChannel axis) const; controller::Input makeInput(TouchAxisChannel axis) const;