Test

Author: reesque

src/core/controller.cpp

@@ -64,109 +64,76 @@ void Controller::disconnectGamepad()
 {
     if (m_currentGamepad)
     {
-        toggleDpad(false);
+        disconnect(m_currentGamepad, &QGamepad::axisLeftYChanged, this, &Controller::controllerYAxisChanged);
+        disconnect(m_currentGamepad, &QGamepad::axisLeftXChanged, this, &Controller::controllerXAxisChanged);
         disconnect(m_currentGamepad, &QGamepad::buttonBChanged, this, &Controller::controllerButtonBChanged);
         disconnect(m_currentGamepad, &QGamepad::buttonAChanged, this, &Controller::controllerButtonAChanged);
         m_currentGamepad->deleteLater();
         m_currentGamepad = nullptr;
     }
 }
 
-void Controller::toggleDpad(bool isOn)
-{
-    if (isOn)
-    {
-        connect(m_currentGamepad, &QGamepad::buttonLeftChanged, this, &Controller::controllerButtonLeftChanged);
-        connect(m_currentGamepad, &QGamepad::buttonRightChanged, this, &Controller::controllerButtonRightChanged);
-        connect(m_currentGamepad, &QGamepad::buttonUpChanged, this, &Controller::controllerButtonUpChanged);
-        connect(m_currentGamepad, &QGamepad::buttonDownChanged, this, &Controller::controllerButtonDownChanged);
-        return;
-    }
-
-    disconnect(m_currentGamepad, &QGamepad::buttonUpChanged, this, &Controller::controllerButtonUpChanged);
-    disconnect(m_currentGamepad, &QGamepad::buttonDownChanged, this, &Controller::controllerButtonDownChanged);
-    disconnect(m_currentGamepad, &QGamepad::buttonBChanged, this, &Controller::controllerButtonBChanged);
-    disconnect(m_currentGamepad, &QGamepad::buttonAChanged, this, &Controller::controllerButtonAChanged);
-}
-
 void Controller::connectGamepad(int id)
 {
     disconnectGamepad();
     m_currentGamepad = new QGamepad(id, this);
 
-    toggleDpad(true);
+    connect(m_currentGamepad, &QGamepad::axisLeftYChanged, this, &Controller::controllerYAxisChanged);
+    connect(m_currentGamepad, &QGamepad::axisLeftXChanged, this, &Controller::controllerXAxisChanged);
     connect(m_currentGamepad, &QGamepad::buttonBChanged, this, &Controller::controllerButtonBChanged);
     connect(m_currentGamepad, &QGamepad::buttonAChanged, this, &Controller::controllerButtonAChanged);
 }
 
-void Controller::controllerButtonUpChanged(bool value)
-{
-    if (!value || m_dpadDebounceTimer->isActive())
-    {
-        return;
-    }
-
-    toggleDpad(false);
-    m_dpadDebounceTimer->start();
-    emit triggerUpAction();
-}
-
-void Controller::controllerButtonDownChanged(bool value)
-{
-    if (!value || m_dpadDebounceTimer->isActive())
-    {
-        return;
-    }
-
-    toggleDpad(false);
-    m_dpadDebounceTimer->start();
-    emit triggerDownAction();
-}
-
-void Controller::controllerButtonLeftChanged(bool value)
+void Controller::controllerYAxisChanged(double value)
 {
-    if (!value || m_dpadDebounceTimer->isActive())
+    if (!m_dpadDebounceTimer->isActive())
     {
-        return;
+        if (value > 0)
+        {
+            m_dpadDebounceTimer->start();
+            emit triggerDownAction();
+        }
+        else if (value < 0)
+        {
+            m_dpadDebounceTimer->start();
+            emit triggerUpAction();
+        }
     }
-
-    toggleDpad(false);
-    m_dpadDebounceTimer->start();
-    emit triggerLeftAction();
 }
 
-void Controller::controllerButtonRightChanged(bool value)
+void Controller::controllerXAxisChanged(double value)
 {
-    if (!value || m_dpadDebounceTimer->isActive())
+    if (!m_dpadDebounceTimer->isActive())
     {
-        return;
+        if (value > 0)
+        {
+            m_dpadDebounceTimer->start();
+            emit triggerRightAction();
+        }
+        else if (value < 0)
+        {
+            m_dpadDebounceTimer->start();
+            emit triggerLeftAction();
+        }
     }
-
-    toggleDpad(false);
-    m_dpadDebounceTimer->start();
-    emit triggerRightAction();
 }
 
 void Controller::controllerButtonAChanged(bool value)
 {
-    if (!value || m_faceBtnDebounceTimer->isActive())
+    if (value && !m_faceBtnDebounceTimer->isActive())
     {
-        return;
+        m_faceBtnDebounceTimer->start();
+        emit triggerConfirmAction();
     }
-
-    m_faceBtnDebounceTimer->start();
-    emit triggerConfirmAction();
 }
 
 void Controller::controllerButtonBChanged(bool value)
 {
-    if (!value || m_faceBtnDebounceTimer->isActive())
+    if (value && !m_faceBtnDebounceTimer->isActive())
     {
-        return;
+        m_faceBtnDebounceTimer->start();
+        emit triggerBackAction();
     }
-
-    m_faceBtnDebounceTimer->start();
-    emit triggerBackAction();
 }
 
 void Controller::connectedGamepadsChanged()

src/core/controller.h

@@ -32,10 +32,8 @@ public slots:
 
 private slots:
     void connectedGamepadsChanged();
-    void controllerButtonUpChanged(bool value);
-    void controllerButtonDownChanged(bool value);
-    void controllerButtonLeftChanged(bool value);
-    void controllerButtonRightChanged(bool value);
+    void controllerYAxisChanged(double value);
+    void controllerXAxisChanged(double value);
     void controllerButtonAChanged(bool value);
     void controllerButtonBChanged(bool value);