#225: Sticks dead zone configuration added

XITRIX · XITRIX · commit b63868952a69 · 2025-03-29T16:39:57.000+01:00
diff --git a/app/include/settings_tab.hpp b/app/include/settings_tab.hpp
@@ -27,6 +27,8 @@ class SettingsTab : public brls::Box {
     BRLS_BIND(brls::BooleanCell, pcAudio, "pcAudio");
     BRLS_BIND(brls::BooleanCell, swapUi, "swap_ui");
     BRLS_BIND(brls::DetailCell, swapGame, "swap_game");
+    BRLS_BIND(brls::DetailCell, deadzoneStickLeft, "dead_zone_stick_left");
+    BRLS_BIND(brls::DetailCell, deadzoneStickRight, "dead_zone_stick_right");
     BRLS_BIND(brls::Header, rumbleForceHeader, "rumble_slider_header");
     BRLS_BIND(brls::Slider, rumbleForceSlider, "rumble_slider");
     BRLS_BIND(brls::BooleanCell, swapStickToDpad, "swap_stick_to_dpad");
@@ -54,4 +56,5 @@ class SettingsTab : public brls::Box {
                                   std::vector<brls::ControllerButton> buttons);
     std::string getTextFromButtons(std::vector<brls::ControllerButton> buttons);
     NVGcolor getColorFromButtons(std::vector<brls::ControllerButton> buttons);
+    void updateDeadZoneItems();
 };
diff --git a/app/src/settings_tab.cpp b/app/src/settings_tab.cpp
@@ -297,6 +297,48 @@ SettingsTab::SettingsTab() {
         return true;
     });
 
+
+    deadzoneStickLeft->setText("settings/deadzone/stick_left"_i18n);
+    deadzoneStickRight->setText("settings/deadzone/stick_right"_i18n);
+
+    updateDeadZoneItems();
+
+    deadzoneStickLeft->registerClickAction([this](View* view) {
+        int currentValue = int(Settings::instance().get_deadzone_stick_left() * 100);
+        bool res = Application::getImeManager()->openForNumber([&](long number) {
+                                                        Settings::instance().set_deadzone_stick_left(float(number) / 100.f);
+                                                        this->updateDeadZoneItems();
+                                                    },
+                                                    "settings/deadzone/stick_left"_i18n, "settings/deadzone/input_hint"_i18n, 2,
+                                                    currentValue > 0 ? std::to_string(currentValue) : "", "",
+                                                    "", 0);
+
+        if (!res) {
+            Settings::instance().set_deadzone_stick_left(0);
+            this->updateDeadZoneItems();
+        }
+
+        return true;
+    });
+
+    deadzoneStickRight->registerClickAction([this](View* view) {
+        int currentValue = int(Settings::instance().get_deadzone_stick_right() * 100);
+        bool res = Application::getImeManager()->openForNumber([&](long number) {
+                                                        Settings::instance().set_deadzone_stick_right(float(number) / 100.f);
+                                                        this->updateDeadZoneItems();
+                                                    },
+                                                    "settings/deadzone/stick_right"_i18n, "settings/deadzone/input_hint"_i18n, 2,
+                                                    currentValue > 0 ? std::to_string(currentValue) : "", "",
+                                                    "", 0);
+
+        if (!res) {
+            Settings::instance().set_deadzone_stick_right(0);
+            this->updateDeadZoneItems();
+        }
+
+        return true;
+    });
+
     float rumbleForceProgress = Settings::instance().get_rumble_force();
     rumbleForceSlider->getProgressEvent()->subscribe([this](float value) {
         std::stringstream stream;
@@ -510,6 +552,24 @@ SettingsTab::SettingsTab() {
                    });
 }
 
+void SettingsTab::updateDeadZoneItems() {
+    if (Settings::instance().get_deadzone_stick_left() > 0) {
+        deadzoneStickLeft->setDetailTextColor(Application::getTheme()["brls/list/listItem_value_color"]);
+        deadzoneStickLeft->setDetailText(fmt::format("{}%", int(Settings::instance().get_deadzone_stick_left() * 100.f)));
+    } else {
+        deadzoneStickLeft->setDetailTextColor(Application::getTheme()["brls/text_disabled"]);
+        deadzoneStickLeft->setDetailText("hints/off"_i18n);
+    }
+
+    if (Settings::instance().get_deadzone_stick_right() > 0) {
+        deadzoneStickRight->setDetailTextColor(Application::getTheme()["brls/list/listItem_value_color"]);
+        deadzoneStickRight->setDetailText(fmt::format("{}%", int(Settings::instance().get_deadzone_stick_right() * 100)));
+    } else {
+        deadzoneStickRight->setDetailTextColor(Application::getTheme()["brls/text_disabled"]);
+        deadzoneStickRight->setDetailText("hints/off"_i18n);
+    }
+}
+
 void SettingsTab::setupButtonsSelectorCell(
     brls::DetailCell* cell, std::vector<ControllerButton> buttons) {
     cell->setDetailText(getTextFromButtons(buttons));
diff --git a/app/src/streaming/InputManager.cpp b/app/src/streaming/InputManager.cpp
@@ -12,6 +12,14 @@
 
 using namespace brls;
 
+float fsqrt_(float f) {
+    int i = *(int *)&f;
+    i = (i >> 1) + 0x1fbb67ae;
+    float f1 = *(float *)&i;
+    return 0.5F * (f1 + f / f1);
+
+}
+
 MoonlightInputManager::MoonlightInputManager() {
     auto inputManager = brls::Application::getPlatform()->getInputManager();
 
@@ -181,20 +189,45 @@ GamepadState MoonlightInputManager::getControllerState(int controllerNum,
     float lzAxis = controller.axes[LEFT_Z] > 0 ? controller.axes[LEFT_Z] : (controller.buttons[brls::BUTTON_LT] ? 1.f : 0.f);
     float rzAxis = controller.axes[RIGHT_Z] > 0 ? controller.axes[RIGHT_Z] : (controller.buttons[brls::BUTTON_RT] ? 1.f : 0.f);
 
+    // Truncate dead zones
+    float leftStickDeadzone = Settings::instance().get_deadzone_stick_left();
+    float rightStickDeadzone = Settings::instance().get_deadzone_stick_right();
+
+    float leftXAxis = controller.axes[brls::LEFT_X];
+    float leftYAxis = controller.axes[brls::LEFT_Y];
+    float rightXAxis = controller.axes[brls::RIGHT_X];
+    float rightYAxis = controller.axes[brls::RIGHT_Y];
+
+    if (leftStickDeadzone > 0) {
+        float magnitude = fsqrt_(std::powf(leftXAxis, 2) + std::powf(leftYAxis, 2));
+        if (magnitude < leftStickDeadzone) {
+            leftXAxis = 0;
+            leftYAxis = 0;
+        }
+    }
+
+    if (rightStickDeadzone > 0) {
+        float magnitude = fsqrt_(std::powf(rightXAxis, 2) + std::powf(rightYAxis, 2));
+        if (magnitude < rightStickDeadzone) {
+            rightXAxis = 0;
+            rightYAxis = 0;
+        }
+    }
+
     GamepadState gamepadState{
         .buttonFlags = 0,
         .leftTrigger = static_cast<unsigned char>(
             0xFFFF * (!specialKey ? lzAxis : 0)),
         .rightTrigger = static_cast<unsigned char>(
             0xFFFF * (!specialKey ? rzAxis : 0)),
         .leftStickX = static_cast<short>(
-            0x7FFF * (!specialKey ? controller.axes[brls::LEFT_X] : 0)),
+            0x7FFF * (!specialKey ? leftXAxis : 0)),
         .leftStickY = static_cast<short>(
-            -0x7FFF * (!specialKey ? controller.axes[brls::LEFT_Y] : 0)),
+            -0x7FFF * (!specialKey ? leftYAxis : 0)),
         .rightStickX = static_cast<short>(
-            0x7FFF * (!specialKey ? controller.axes[brls::RIGHT_X] : 0)),
+            0x7FFF * (!specialKey ? rightXAxis : 0)),
         .rightStickY = static_cast<short>(
-            -0x7FFF * (!specialKey ? controller.axes[brls::RIGHT_Y] : 0)),
+            -0x7FFF * (!specialKey ? rightYAxis : 0)),
     };
 
     brls::ControllerButton a = brls::BUTTON_A;
diff --git a/app/src/utils/Settings.cpp b/app/src/utils/Settings.cpp
@@ -329,6 +329,18 @@ void Settings::load() {
                     m_mouse_speed_multiplier = (int)json_integer_value(mouse_speed_multiplier);
                 }
             }
+
+            if (json_t* deadzone_stick_left = json_object_get(settings, "deadzone_stick_left")) {
+                if (json_typeof(deadzone_stick_left) == JSON_INTEGER) {
+                    m_deadzone_stick_left = (float)json_integer_value(deadzone_stick_left) / 100.f;
+                }
+            }
+
+            if (json_t* deadzone_stick_right = json_object_get(settings, "deadzone_stick_right")) {
+                if (json_typeof(deadzone_stick_right) == JSON_INTEGER) {
+                    m_deadzone_stick_right = (float)json_integer_value(deadzone_stick_right) / 100.f;
+                }
+            }
             
             if (json_t* rumble_force = json_object_get(settings, "rumble_force")) {
                 if (json_typeof(rumble_force) == JSON_INTEGER) {
@@ -492,6 +504,8 @@ void Settings::save() {
             json_object_set_new(settings, "overlay_hold_time", json_integer(m_overlay_options.holdTime));
             json_object_set_new(settings, "mouse_input_hold_time", json_integer(m_mouse_input_options.holdTime));
             json_object_set_new(settings, "mouse_speed_multiplier", json_integer(m_mouse_speed_multiplier));
+            json_object_set_new(settings, "deadzone_stick_left", json_integer(int(m_deadzone_stick_left * 100.f)));
+            json_object_set_new(settings, "deadzone_stick_right", json_integer(int(m_deadzone_stick_right * 100.f)));
             json_object_set_new(settings, "rumble_force", json_integer(m_rumble_force));
             json_object_set_new(settings, "current_mapping_layout", json_integer(m_current_mapping_layout));
             json_object_set_new(settings, "keyboard_type", json_integer(m_keyboard_type));
diff --git a/app/src/utils/Settings.hpp b/app/src/utils/Settings.hpp
@@ -160,6 +160,12 @@ class Settings : public Singleton<Settings> {
     void set_mouse_speed_multiplier(int mouse_speed_multiplier) { m_mouse_speed_multiplier = mouse_speed_multiplier; }
     [[nodiscard]] int get_mouse_speed_multiplier() const { return m_mouse_speed_multiplier; }
 
+    void set_deadzone_stick_left(float deadzone) { m_deadzone_stick_left = deadzone; }
+    [[nodiscard]] float get_deadzone_stick_left() const { return m_deadzone_stick_left; }
+
+    void set_deadzone_stick_right(float deadzone) { m_deadzone_stick_right = deadzone; }
+    [[nodiscard]] float get_deadzone_stick_right() const { return m_deadzone_stick_right; }
+
     int get_current_mapping_layout();
     void set_current_mapping_layout(int layout) { m_current_mapping_layout = layout; }
 
@@ -218,5 +224,8 @@ class Settings : public Singleton<Settings> {
         .buttons = {},
     };
 
+    float m_deadzone_stick_left = 0;
+    float m_deadzone_stick_right = 0;
+
     void loadBaseLayouts();
 };
diff --git a/resources/i18n/en-US/main.json b/resources/i18n/en-US/main.json
@@ -100,6 +100,12 @@
             "home": "Home",
             "screenshot": "Screenshot"
         },
+        "deadzone": {
+            "input_hint": "Dead zone value in percent",
+            "stick_left": "Left stick",
+            "stick_right": "Right stick",
+            "title": "Dead zones"
+        },
         "debug": "Debug",
         "debugging_view": "Show debugging view",
         "decoder_threads": "Decoder Threads",
diff --git a/resources/i18n/ru/main.json b/resources/i18n/ru/main.json
@@ -100,6 +100,12 @@
             "home": "Домой",
             "screenshot": "Скриншот"
         },
+        "deadzone": {
+            "input_hint": "Значение мёртвой зоны в процентах",
+            "stick_left": "Левый стик",
+            "stick_right": "Правый стик",
+            "title": "Мёртвые зоны"
+        },
         "debug": "Отладка",
         "debugging_view": "Показать окно отладки",
         "decoder_threads": "Потоки декодера",
diff --git a/resources/xml/tabs/settings.xml b/resources/xml/tabs/settings.xml
@@ -79,6 +79,16 @@
             <brls:DetailCell
                 id="swap_game"/>
 
+            <brls:Header
+                    title="@i18n/settings/deadzone/title"
+                    paddingTop="60"/>
+
+            <brls:DetailCell
+                    id="dead_zone_stick_left"/>
+
+            <brls:DetailCell
+                    id="dead_zone_stick_right"/>
+
             <brls:Header
                 id="rumble_slider_header"
                 title="@i18n/settings/rumble_force"
