found a spot for axis thresholds

Author: briaguya-ai

src/controller/controldeck/ControlDeck.cpp

@@ -13,6 +13,7 @@ namespace Ship {
 ControlDeck::ControlDeck(std::vector<CONTROLLERBUTTONS_T> additionalBitmasks) : mSinglePlayerMappingMode(false) {
     mDeviceIndexMappingManager = std::make_shared<ShipDeviceIndexMappingManager>();
     mConnectedPhysicalDeviceManager = std::make_shared<ConnectedPhysicalDeviceManager>();
+    mGlobalSDLDeviceSettings = std::make_shared<GlobalSDLDeviceSettings>();
 }
 
 ControlDeck::~ControlDeck() {
@@ -114,6 +115,10 @@ std::shared_ptr<ConnectedPhysicalDeviceManager> ControlDeck::GetConnectedPhysica
     return mConnectedPhysicalDeviceManager;
 }
 
+std::shared_ptr<GlobalSDLDeviceSettings> ControlDeck::GetGlobalSDLDeviceSettings() {
+    return mGlobalSDLDeviceSettings;
+}
+
 void ControlDeck::SetSinglePlayerMappingMode(bool singlePlayer) {
     mSinglePlayerMappingMode = singlePlayer;
 }

src/controller/controldeck/ControlDeck.h

@@ -6,6 +6,7 @@
 #include "controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h"
 #include "controller/deviceindex/ShipDeviceIndexMappingManager.h"
 #include "controller/physicaldevice/ConnectedPhysicalDeviceManager.h"
+#include "controller/physicaldevice/GlobalSDLDeviceSettings.h"
 
 namespace Ship {
 
@@ -30,6 +31,7 @@ class ControlDeck {
 
     std::shared_ptr<ShipDeviceIndexMappingManager> GetDeviceIndexMappingManager();
     std::shared_ptr<ConnectedPhysicalDeviceManager> GetConnectedPhysicalDeviceManager();
+    std::shared_ptr<GlobalSDLDeviceSettings> GetGlobalSDLDeviceSettings();
 
   protected:
     bool AllGameInputBlocked();
@@ -41,6 +43,7 @@ class ControlDeck {
     std::unordered_map<int32_t, bool> mGameInputBlockers;
     std::shared_ptr<ShipDeviceIndexMappingManager> mDeviceIndexMappingManager;
     std::shared_ptr<ConnectedPhysicalDeviceManager> mConnectedPhysicalDeviceManager;
+    std::shared_ptr<GlobalSDLDeviceSettings> mGlobalSDLDeviceSettings;
 };
 } // namespace Ship
 

src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.cpp

@@ -18,21 +18,12 @@ void SDLAxisDirectionToButtonMapping::UpdatePad(CONTROLLERBUTTONS_T& padButtons)
         return;
     }
 
-    // todo: threshold percentages
     int32_t axisThresholdPercentage = 25;
-    // auto indexMapping = Context::GetInstance()
-    //                         ->GetControlDeck()
-    //                         ->GetDeviceIndexMappingManager()
-    //                         ->GetDeviceIndexMappingFromShipDeviceIndex(ControllerInputMapping::mPhysicalDeviceType);
-    // auto sdlIndexMapping = std::dynamic_pointer_cast<ShipDeviceIndexToSDLDeviceIndexMapping>(indexMapping);
-
-    // if (sdlIndexMapping != nullptr) {
-    //     if (AxisIsStick()) {
-    //         axisThresholdPercentage = sdlIndexMapping->GetStickAxisThresholdPercentage();
-    //     } else if (AxisIsTrigger()) {
-    //         axisThresholdPercentage = sdlIndexMapping->GetTriggerAxisThresholdPercentage();
-    //     }
-    // }
+    if (AxisIsStick()) {
+        axisThresholdPercentage = Ship::Context::GetInstance()->GetControlDeck()->GetGlobalSDLDeviceSettings()->GetStickAxisThresholdPercentage();
+    } else if (AxisIsTrigger()) {
+        axisThresholdPercentage = Ship::Context::GetInstance()->GetControlDeck()->GetGlobalSDLDeviceSettings()->GetTriggerAxisThresholdPercentage();
+    }
 
     for (const auto& [instanceId, gamepad] :
          Context::GetInstance()->GetControlDeck()->GetConnectedPhysicalDeviceManager()->GetConnectedSDLGamepadsForPort(

src/controller/physicaldevice/GlobalSDLDeviceSettings.cpp

@@ -0,0 +1,50 @@
+#include "GlobalSDLDeviceSettings.h"
+
+#include <string>
+#include "utils/StringHelper.h"
+#include "public/bridge/consolevariablebridge.h"
+
+namespace Ship {
+GlobalSDLDeviceSettings::GlobalSDLDeviceSettings() {
+    const std::string mappingCvarKey = CVAR_PREFIX_CONTROLLERS ".GlobalSDLDeviceSettings";
+    const int32_t defaultAxisThresholdPercentage = 25;
+    mStickAxisThresholdPercentage = CVarGetInteger(StringHelper::Sprintf("%s.StickAxisThresholdPercentage", mappingCvarKey.c_str()).c_str(), defaultAxisThresholdPercentage);
+    mTriggerAxisThresholdPercentage = CVarGetInteger(StringHelper::Sprintf("%s.TriggerAxisThresholdPercentage", mappingCvarKey.c_str()).c_str(), defaultAxisThresholdPercentage);
+}
+
+GlobalSDLDeviceSettings::~GlobalSDLDeviceSettings() {
+}
+
+int32_t GlobalSDLDeviceSettings::GetStickAxisThresholdPercentage() {
+    return mStickAxisThresholdPercentage;
+}
+
+void GlobalSDLDeviceSettings::SetStickAxisThresholdPercentage(int32_t stickAxisThresholdPercentage) {
+    mStickAxisThresholdPercentage = stickAxisThresholdPercentage;
+}
+
+int32_t GlobalSDLDeviceSettings::GetTriggerAxisThresholdPercentage() {
+    return mTriggerAxisThresholdPercentage;
+}
+
+void GlobalSDLDeviceSettings::SetTriggerAxisThresholdPercentage(int32_t triggerAxisThresholdPercentage) {
+    mTriggerAxisThresholdPercentage = triggerAxisThresholdPercentage;
+}
+
+void GlobalSDLDeviceSettings::SaveToConfig() {
+    const std::string mappingCvarKey = CVAR_PREFIX_CONTROLLERS ".GlobalSDLDeviceSettings";
+    CVarSetInteger(StringHelper::Sprintf("%s.StickAxisThresholdPercentage", mappingCvarKey.c_str()).c_str(),
+                   mStickAxisThresholdPercentage);
+    CVarSetInteger(StringHelper::Sprintf("%s.TriggerAxisThresholdPercentage", mappingCvarKey.c_str()).c_str(),
+                   mTriggerAxisThresholdPercentage);
+    CVarSave();
+}
+
+void GlobalSDLDeviceSettings::EraseFromConfig() {
+    const std::string mappingCvarKey = CVAR_PREFIX_CONTROLLERS ".GlobalSDLDeviceSettings";
+    CVarClear(StringHelper::Sprintf("%s.StickAxisThresholdPercentage", mappingCvarKey.c_str()).c_str());
+    CVarClear(StringHelper::Sprintf("%s.TriggerAxisThresholdPercentage", mappingCvarKey.c_str()).c_str());
+
+    CVarSave();
+}
+} // namespace Ship

src/controller/physicaldevice/GlobalSDLDeviceSettings.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <cstdint>
+
+namespace Ship {
+
+class GlobalSDLDeviceSettings {
+  public:
+    GlobalSDLDeviceSettings();
+    ~GlobalSDLDeviceSettings();
+
+    int32_t GetStickAxisThresholdPercentage();
+    void SetStickAxisThresholdPercentage(int32_t stickAxisThresholdPercentage);
+
+    int32_t GetTriggerAxisThresholdPercentage();
+    void SetTriggerAxisThresholdPercentage(int32_t triggerAxisThresholdPercentage);
+
+    void SaveToConfig();
+    void EraseFromConfig();
+
+  private:
+    int32_t mStickAxisThresholdPercentage;
+    int32_t mTriggerAxisThresholdPercentage;
+};
+} // namespace Ship