Add way to reset deadzone settings

Author: Crementif

include/pch.h

@@ -513,6 +513,9 @@ enum class AngularVelocityFixerMode : int32_t {
 };
 
 struct ModSettings {
+    static constexpr float kDefaultAxisThreshold = 0.5f;
+    static constexpr float kDefaultStickDeadzone = 0.15f;
+
     // playing mode settings
     std::atomic<CameraMode> cameraMode = CameraMode::FIRST_PERSON;
     std::atomic<PlayMode> playMode = PlayMode::STANDING;
@@ -534,8 +537,8 @@ struct ModSettings {
     std::atomic_bool tutorialPromptShown = false;
 
     // Input settings
-    std::atomic<float> axisThreshold = 0.5f;
-    std::atomic<float> stickDeadzone = 0.15f;
+    std::atomic<float> axisThreshold = kDefaultAxisThreshold;
+    std::atomic<float> stickDeadzone = kDefaultStickDeadzone;
 
     CameraMode GetCameraMode() const { return cameraMode; }
 
@@ -579,8 +582,8 @@ struct ModSettings {
         std::format_to(std::back_inserter(buffer), " - Show Black Bars for Third-Person Cutscenes: {}\n", UseBlackBarsForCutscenes() ? "Yes" : "No");
         std::format_to(std::back_inserter(buffer), " - Performance Overlay: {}\n", performanceOverlay == 0 ? "Disabled" : (performanceOverlay == 1 ? "2D Only" : "Enabled"));
         std::format_to(std::back_inserter(buffer), " - Performance Overlay Frequency: {} Hz\n", performanceOverlayFrequency.load());
-        std::format_to(std::back_inserter(buffer), " - Axis Threshold: {}\n", axisThreshold.load());
-        std::format_to(std::back_inserter(buffer), " - Stick Deadzone: {}\n", stickDeadzone.load());
+        std::format_to(std::back_inserter(buffer), " - Stick Direction Threshold: {}\n", axisThreshold.load());
+        std::format_to(std::back_inserter(buffer), " - Thumbstick Deadzone: {}\n", stickDeadzone.load());
         return buffer;
     }
 
@@ -628,4 +631,4 @@ struct data_VRProjectionMatrixOut {
 
 #include "game_structs.h"
 #include "cemu.h"
-#include "utils/logger.h"
+#include "utils/logger.h"

src/rendering/vulkan_imgui.cpp

@@ -315,16 +315,12 @@ RND_Renderer::ImGuiOverlay::ImGuiOverlay(VkCommandBuffer cb, VkExtent2D fbRes, V
 
     std::vector<HelpImage> page1;
     page1.emplace_back(createHelpImage((stbi_uc const*)controls, sizeof(controls)));
+    page1.push_back(createHelpImage((stbi_uc const*)equip, sizeof(equip)));
+    page1.push_back(createHelpImage((stbi_uc const*)swing, sizeof(swing)));
+    page1.push_back(createHelpImage((stbi_uc const*)BOTWcontrolScheme_Magnesis, sizeof(BOTWcontrolScheme_Magnesis)));
+    page1.push_back(createHelpImage((stbi_uc const*)BOTWcontrolScheme_Whistle, sizeof(BOTWcontrolScheme_Whistle)));
     m_helpImagePages.push_back(page1);
 
-    std::vector<HelpImage> page2;
-    page2.push_back(createHelpImage((stbi_uc const*)equip, sizeof(equip)));
-    m_helpImagePages.push_back(page2);
-
-    std::vector<HelpImage> page3;
-    page3.push_back(createHelpImage((stbi_uc const*)swing, sizeof(swing)));
-    m_helpImagePages.push_back(page3);
-
     VulkanUtils::DebugPipelineBarrier(cb);
 
     // start the first frame right away
@@ -859,20 +855,28 @@ void RND_Renderer::ImGuiOverlay::DrawHelpMenu() {
                     ImGui::PopStyleColor();
                     if (cameraMode == 1) {
                         float deadzone = settings.stickDeadzone;
-                        DrawSettingRow("Stick Deadzone", [&]() {
+                        DrawSettingRow("Thumbstick Deadzone", [&]() {
                             if (ImGui::SliderFloat("##StickDeadzone", &deadzone, 0.0f, 0.5f, "%.2f")) {
                                 settings.stickDeadzone = deadzone;
                                 changed = true;
                             }
                         });
 
                         float threshold = settings.axisThreshold;
-                        DrawSettingRow("Axis Threshold", [&]() {
+                        DrawSettingRow("Stick Direction Threshold", [&]() {
                             if (ImGui::SliderFloat("##AxisThreshold", &threshold, 0.1f, 0.9f, "%.2f")) {
                                 settings.axisThreshold = threshold;
                                 changed = true;
                             }
                         });
+
+                        DrawSettingRow("Reset Input Thresholds", [&]() {
+                            if (ImGui::Button("Reset##InputThresholds")) {
+                                settings.stickDeadzone = ModSettings::kDefaultStickDeadzone;
+                                settings.axisThreshold = ModSettings::kDefaultAxisThreshold;
+                                changed = true;
+                            }
+                        });
                     }
                     else {
                         ImGui::Text("");
@@ -1099,4 +1103,4 @@ void RND_Renderer::ImGuiOverlay::DrawAndCopyToImage(VkCommandBuffer cb, VkImage
     // prepare for next frame immediately
     ImGui_ImplVulkan_NewFrame();
     ImGui::NewFrame();
-}
+}