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

Android - Improve View controller making it like a drag rather than like a joystick (reference touch is updated at every frame and is not only the initial touch anymore)

Browse source
This commit is contained in:
Cristian Luis Duarte 2018-03-12 14:55:20 -03:00
parent 67ae6aee33
commit b87a07a7d0
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/controllers/touchscreenvirtualpad.json
View file

@ -7,6 +7,6 @@
{ "from": "TouchscreenVirtualPad.RX", "when": "!Application.CameraIndependent", "filters": [ {"type": "deadZone", "min": 0.05} , "invert" ], "to": "Actions.Yaw" }, { "from": "TouchscreenVirtualPad.RX", "when": "!Application.CameraIndependent", "filters": [ {"type": "deadZone", "min": 0.05} , "invert" ], "to": "Actions.Yaw" },
{ "from": "TouchscreenVirtualPad.RY", "when": "!Application.CameraIndependent", "filters": [ "invert" ], "to": "Actions.Pitch" } { "from": "TouchscreenVirtualPad.RY", "when": "!Application.CameraIndependent", "filters": [ {"type": "deadZone", "min": 0.05}, "invert" ], "to": "Actions.Pitch" }
] ]
} }

6
libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
View file

@ -138,10 +138,13 @@ void TouchscreenVirtualPadDevice::processInputDeviceForView() {
// NOW BETWEEN -1 1 // NOW BETWEEN -1 1
rightDistanceScaleX /= STICK_RADIUS_INCHES; rightDistanceScaleX /= STICK_RADIUS_INCHES;
rightDistanceScaleY /= STICK_RADIUS_INCHES*2; // pitch is slower rightDistanceScaleY /= STICK_RADIUS_INCHES;
_inputDevice->_axisStateMap[controller::RX] = rightDistanceScaleX; _inputDevice->_axisStateMap[controller::RX] = rightDistanceScaleX;
_inputDevice->_axisStateMap[controller::RY] = rightDistanceScaleY; _inputDevice->_axisStateMap[controller::RY] = rightDistanceScaleY;
// after use, save last touch point as ref
_viewRefTouchPoint = _viewCurrentTouchPoint;
} }
void TouchscreenVirtualPadDevice::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) { void TouchscreenVirtualPadDevice::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
@ -343,6 +346,7 @@ void TouchscreenVirtualPadDevice::viewTouchBegin(glm::vec2 touchPoint) {
auto& virtualPadManager = VirtualPad::Manager::instance(); auto& virtualPadManager = VirtualPad::Manager::instance();
if (virtualPadManager.isEnabled() && !virtualPadManager.isHidden()) { if (virtualPadManager.isEnabled() && !virtualPadManager.isHidden()) {
_viewRefTouchPoint = touchPoint; _viewRefTouchPoint = touchPoint;
_viewCurrentTouchPoint = touchPoint;
_viewHasValidTouch = true; _viewHasValidTouch = true;
} }
} }

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

@ -20,7 +20,7 @@
class QTouchEvent; class QTouchEvent;
class QGestureEvent; class QGestureEvent;
const float STICK_RADIUS_INCHES = 1.0f; const float STICK_RADIUS_INCHES = .3f;
class TouchscreenVirtualPadDevice : public InputPlugin { class TouchscreenVirtualPadDevice : public InputPlugin {
Q_OBJECT Q_OBJECT