From 0e1732c45d1d23258c40aee6fc9e73653bf3011b Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Tue, 8 Dec 2020 08:51:30 +0800
Subject: [PATCH] Implement auto acceleration for steering wheel from mobile
 control

---
 data/gui/dialogs/android/init_android.stkgui  | 13 ++++++---
 .../android/multitouch_settings.stkgui        |  8 ++++++
 src/config/user_config.hpp                    |  5 ++++
 src/input/multitouch_device.cpp               |  6 +++--
 .../dialogs/init_android_dialog.cpp           | 27 +++++++++++++++++--
 .../dialogs/multitouch_settings_dialog.cpp    | 10 +++++++
 6 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/data/gui/dialogs/android/init_android.stkgui b/data/gui/dialogs/android/init_android.stkgui
index d7cc8ebde..daa67d5a9 100644
--- a/data/gui/dialogs/android/init_android.stkgui
+++ b/data/gui/dialogs/android/init_android.stkgui
@@ -2,7 +2,7 @@
 <stkgui>
     <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
 
-        <box width="100%" height="80%" padding="10" layout="vertical-row">
+        <box width="100%" height="75%" padding="10" layout="vertical-row">
             <bright width="100%" text="Select a type of control that you prefer" align="center" text_align="left" word_wrap="true"/>
 
             <spacer height="7%" width="10"/>
@@ -16,12 +16,19 @@
                         icon="gui/icons/android/steering_wheel.png" I18N="Control type" text="Steering wheel"/>
             </ribbon>
 
-            <spacer height="12%" width="10"/>
+            <spacer height="6%" width="10"/>
+
+            <div width="100%" height="16%" align="center" layout="horizontal-row">
+                <label align="center" text_align="left" text="Auto acceleration"/>
+                <spacer width="10"/>
+                <checkbox width="7%" height="100%" id="auto_acceleration"/>
+            </div>
 
             <label width="100%" text="You can change it later in touch device settings." text_align="left" word_wrap="true"/>
+
         </box>
 
-        <spacer height="7%" width="10"/>
+        <spacer height="6%" width="10"/>
 
         <button id="close" text="Apply" align="center"/>
  
diff --git a/data/gui/dialogs/android/multitouch_settings.stkgui b/data/gui/dialogs/android/multitouch_settings.stkgui
index f988c3868..91350dd1e 100644
--- a/data/gui/dialogs/android/multitouch_settings.stkgui
+++ b/data/gui/dialogs/android/multitouch_settings.stkgui
@@ -31,6 +31,14 @@
             </div>
         </div>
 
+        <div width="75%" layout="horizontal-row" proportion="1">
+            <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Auto acceleration"/>
+            <div proportion="1" align="center" height="fit" layout="horizontal-row" >
+                <spacer width="40" height="10" />
+                <checkbox id="auto_acceleration"/>
+            </div>
+        </div>
+
         <div width="75%" layout="horizontal-row" proportion="1">
             <label proportion="1" align="center" text_align="right" I18N="In the multitouch settings screen" text="Accelerometer"/>
             <div proportion="1" align="center" height="fit" layout="horizontal-row" >
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index a0c7e3638..fe0030049 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -533,6 +533,11 @@ namespace UserConfigParams
             &m_multitouch_group,
             "Draw steering wheel on right side.") );
 
+    PARAM_PREFIX BoolUserConfigParam         m_multitouch_auto_acceleration
+            PARAM_DEFAULT( BoolUserConfigParam(false, "multitouch_auto_acceleration",
+            &m_multitouch_group,
+            "Auto acceleration for multitouch controls.") );
+
     PARAM_PREFIX IntUserConfigParam         m_multitouch_controls
             PARAM_DEFAULT( IntUserConfigParam(0, "multitouch_controls",
             &m_multitouch_group,
diff --git a/src/input/multitouch_device.cpp b/src/input/multitouch_device.cpp
index 0b806807b..aeca048b6 100644
--- a/src/input/multitouch_device.cpp
+++ b/src/input/multitouch_device.cpp
@@ -494,9 +494,11 @@ void MultitouchDevice::updateAxisY(float value)
     else
     {
         m_controller->action(PA_BRAKE, 0);
-        m_controller->action(PA_ACCEL, 0);
+        m_controller->action(PA_ACCEL,
+            UserConfigParams::m_multitouch_controls == 1 &&
+            UserConfigParams::m_multitouch_auto_acceleration ? Input::MAX_VALUE : 0);
     }
-    
+
 }
 
 // ----------------------------------------------------------------------------
diff --git a/src/states_screens/dialogs/init_android_dialog.cpp b/src/states_screens/dialogs/init_android_dialog.cpp
index 4f69d3297..6f4dc2c41 100644
--- a/src/states_screens/dialogs/init_android_dialog.cpp
+++ b/src/states_screens/dialogs/init_android_dialog.cpp
@@ -105,8 +105,25 @@ void InitAndroidDialog::beforeAddingWidgets()
 GUIEngine::EventPropagation InitAndroidDialog::processEvent(
                                                 const std::string& eventSource)
 {
-    if (eventSource == "close")
-    {  
+    if (eventSource == "control_type")
+    {
+        RibbonWidget* control_type = getWidget<RibbonWidget>("control_type");
+        assert(control_type != NULL);
+
+        const std::string& selected = control_type->getSelectionIDString(
+                                                        PLAYER_ID_GAME_MASTER);
+        if (selected == "steering_wheel")
+        {
+            getWidget<CheckBoxWidget>("auto_acceleration")->setActive(true);
+        }
+        else
+        {
+            getWidget<CheckBoxWidget>("auto_acceleration")->setState(false);
+            getWidget<CheckBoxWidget>("auto_acceleration")->setActive(false);
+        }
+    }
+    else if (eventSource == "close")
+    {
         RibbonWidget* control_type = getWidget<RibbonWidget>("control_type");
         assert(control_type != NULL);
         
@@ -121,14 +138,17 @@ GUIEngine::EventPropagation InitAndroidDialog::processEvent(
         if (selected == "steering_wheel")
         {
             UserConfigParams::m_multitouch_controls = MULTITOUCH_CONTROLS_STEERING_WHEEL;
+            UserConfigParams::m_multitouch_auto_acceleration = getWidget<CheckBoxWidget>("auto_acceleration")->getState();
         }
         else if (selected == "accelerometer")
         {
             UserConfigParams::m_multitouch_controls = MULTITOUCH_CONTROLS_ACCELEROMETER;
+            UserConfigParams::m_multitouch_auto_acceleration = false;
         }
         else if (selected == "gyroscope")
         {
             UserConfigParams::m_multitouch_controls = MULTITOUCH_CONTROLS_GYROSCOPE;
+            UserConfigParams::m_multitouch_auto_acceleration = false;
         }
         
         user_config->saveConfig();
@@ -151,17 +171,20 @@ void InitAndroidDialog::updateValues()
     {
         int id = control_type->findItemNamed("accelerometer");
         control_type->setSelection(id, PLAYER_ID_GAME_MASTER);
+        getWidget<CheckBoxWidget>("auto_acceleration")->setActive(false);
     }
     else if (UserConfigParams::m_multitouch_controls == MULTITOUCH_CONTROLS_GYROSCOPE)
     {
         int id = control_type->findItemNamed("gyroscope");
         control_type->setSelection(id, PLAYER_ID_GAME_MASTER);
+        getWidget<CheckBoxWidget>("auto_acceleration")->setActive(false);
     }
     else
     {
         int id = control_type->findItemNamed("steering_wheel");
         control_type->setSelection(id, PLAYER_ID_GAME_MASTER);
     }
+    getWidget<CheckBoxWidget>("auto_acceleration")->setState(false);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/src/states_screens/dialogs/multitouch_settings_dialog.cpp b/src/states_screens/dialogs/multitouch_settings_dialog.cpp
index 90856bdfb..e04962f3c 100644
--- a/src/states_screens/dialogs/multitouch_settings_dialog.cpp
+++ b/src/states_screens/dialogs/multitouch_settings_dialog.cpp
@@ -138,6 +138,9 @@ GUIEngine::EventPropagation MultitouchSettingsDialog::processEvent(
             UserConfigParams::m_multitouch_controls = MULTITOUCH_CONTROLS_GYROSCOPE;
         }
 
+        if (UserConfigParams::m_multitouch_controls == MULTITOUCH_CONTROLS_STEERING_WHEEL)
+            UserConfigParams::m_multitouch_auto_acceleration = getWidget<CheckBoxWidget>("auto_acceleration")->getState();
+
         MultitouchDevice* touch_device = input_manager->getDeviceManager()->
                                                         getMultitouchDevice();
 
@@ -183,12 +186,14 @@ GUIEngine::EventPropagation MultitouchSettingsDialog::processEvent(
         CheckBoxWidget* gyroscope = getWidget<CheckBoxWidget>("gyroscope");
         assert(gyroscope != NULL);
         gyroscope->setState(false);
+        getWidget<CheckBoxWidget>("auto_acceleration")->setState(false);
     }
     else if (eventSource == "gyroscope")
     {
         CheckBoxWidget* accelerometer = getWidget<CheckBoxWidget>("accelerometer");
         assert(accelerometer != NULL);
         accelerometer->setState(false);
+        getWidget<CheckBoxWidget>("auto_acceleration")->setState(false);
     }
 
     return GUIEngine::EVENT_LET;
@@ -232,6 +237,11 @@ void MultitouchSettingsDialog::updateValues()
     CheckBoxWidget* gyroscope = getWidget<CheckBoxWidget>("gyroscope");
     assert(gyroscope != NULL);
     gyroscope->setState(UserConfigParams::m_multitouch_controls == MULTITOUCH_CONTROLS_GYROSCOPE);
+
+    if (UserConfigParams::m_multitouch_controls == MULTITOUCH_CONTROLS_STEERING_WHEEL)
+        getWidget<CheckBoxWidget>("auto_acceleration")->setState(UserConfigParams::m_multitouch_auto_acceleration);
+    else
+        getWidget<CheckBoxWidget>("auto_acceleration")->setState(false);
 }
 
 // -----------------------------------------------------------------------------