From b61a436a844b8370331f73165b3fd0b66d8a5b27 Mon Sep 17 00:00:00 2001
From: Cristian Luis Duarte <cristian.duarte.mb@gmail.com>
Date: Wed, 4 Apr 2018 18:23:03 -0300
Subject: [PATCH] Android fly - Use new asset and screen position - missing cpp

---
 .../TouchscreenVirtualPadDevice.cpp           | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
index 8b922434da..d5df7a7e25 100644
--- a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.cpp
@@ -57,8 +57,7 @@ void TouchscreenVirtualPadDevice::init() {
     }
 
     auto& virtualPadManager = VirtualPad::Manager::instance();
-    setupFixedCenter(virtualPadManager, true);
-    setupJumpButton(virtualPadManager);
+    setupControlsPositions(virtualPadManager, true);
 
     if (_fixedPosition) {
         virtualPadManager.getLeftVirtualPad()->setShown(virtualPadManager.isEnabled() && !virtualPadManager.isHidden()); // Show whenever it's enabled
@@ -67,24 +66,22 @@ void TouchscreenVirtualPadDevice::init() {
     KeyboardMouseDevice::enableTouch(false); // Touch for view controls is managed by this plugin
 }
 
-void TouchscreenVirtualPadDevice::setupFixedCenter(VirtualPad::Manager& virtualPadManager, bool force) {
-    if (!_fixedPosition) return;
-
+void TouchscreenVirtualPadDevice::setupControlsPositions(VirtualPad::Manager& virtualPadManager, bool force) {
     if (_extraBottomMargin == virtualPadManager.extraBottomMargin() && !force) return; // Our only criteria to decide a center change is the bottom margin
 
-    _extraBottomMargin = virtualPadManager.extraBottomMargin();
-    float margin = _screenDPI * VirtualPad::Manager::BASE_MARGIN_PIXELS / VirtualPad::Manager::DPI;
     QScreen* eventScreen = qApp->primaryScreen(); // do not call every time
-    _fixedCenterPosition = glm::vec2( _fixedRadius + margin, eventScreen->size().height() - margin - _fixedRadius - _extraBottomMargin);
+    _extraBottomMargin = virtualPadManager.extraBottomMargin();
 
+    // Movement stick
+    float margin = _screenDPI * VirtualPad::Manager::BASE_MARGIN_PIXELS / VirtualPad::Manager::DPI;
+    _fixedCenterPosition = glm::vec2( _fixedRadius + margin, eventScreen->size().height() - margin - _fixedRadius - _extraBottomMargin);
     _moveRefTouchPoint = _fixedCenterPosition;
     virtualPadManager.getLeftVirtualPad()->setFirstTouch(_moveRefTouchPoint);
-}
 
-void TouchscreenVirtualPadDevice::setupJumpButton(VirtualPad::Manager& virtualPadManager) {
-    QScreen* screen = qApp->primaryScreen();
-    float topMargin = _screenDPI * VirtualPad::Manager::JUMP_BTN_TOP_MARGIN_PIXELS / VirtualPad::Manager::DPI;
-    _jumpButtonPosition = glm::vec2( screen->size().width() / 2 + _jumpButtonRadius/2, topMargin + _jumpButtonRadius);
+    // Jump button
+    float leftMargin = _screenDPI * VirtualPad::Manager::JUMP_BTN_LEFT_MARGIN_PIXELS / VirtualPad::Manager::DPI;
+    float bottomMargin = _screenDPI * VirtualPad::Manager::JUMP_BTN_BOTTOM_MARGIN_PIXELS/ VirtualPad::Manager::DPI;
+    _jumpButtonPosition = glm::vec2( _jumpButtonRadius + leftMargin, eventScreen->size().height() - bottomMargin - _jumpButtonRadius - _extraBottomMargin);
     virtualPadManager.setJumpButtonPosition(_jumpButtonPosition);
 }
 
@@ -165,7 +162,7 @@ void TouchscreenVirtualPadDevice::pluginUpdate(float deltaTime, const controller
     });
 
     auto& virtualPadManager = VirtualPad::Manager::instance();
-    setupFixedCenter(virtualPadManager);
+    setupControlsPositions(virtualPadManager);
 
     if (_moveHasValidTouch) {
         processInputDeviceForMove(virtualPadManager);