From 750a74206c830fbc41add28f62bb0baf7a896564 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 12 Feb 2023 13:17:10 +1000 Subject: [PATCH] InputManager: Warning fix/default interia value --- pcsx2/Frontend/InputManager.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pcsx2/Frontend/InputManager.cpp b/pcsx2/Frontend/InputManager.cpp index be675737a6..7fb1a95d81 100644 --- a/pcsx2/Frontend/InputManager.cpp +++ b/pcsx2/Frontend/InputManager.cpp @@ -1222,16 +1222,18 @@ void InputManager::ReloadBindings(SettingsInterface& si, SettingsInterface& bind for (u32 pad = 0; pad < PAD::NUM_CONTROLLER_PORTS; pad++) AddPadBindings(binding_si, pad, PAD::GetDefaultPadType(pad)); - const float ui_ctrl_range = 100.0f; - const float pointer_sensitivity = 0.05; + constexpr float ui_ctrl_range = 100.0f; + constexpr float pointer_sensitivity = 0.05f; for (u32 axis = 0; axis <= static_cast(InputPointerAxis::Y); axis++) { - s_pointer_axis_speed[axis] = si.GetFloatValue("Pad", fmt::format("Pointer{}Speed", s_pointer_axis_names[axis]).c_str(), 40.0f) / ui_ctrl_range * pointer_sensitivity; - s_pointer_axis_dead_zone[axis] = std::min(si.GetFloatValue("Pad", fmt::format("Pointer{}DeadZone", s_pointer_axis_names[axis]).c_str(), 20.0f) / ui_ctrl_range, 1.0f); - s_pointer_axis_range[axis] = 1.0f - s_pointer_axis_dead_zone[axis]; + s_pointer_axis_speed[axis] = si.GetFloatValue("Pad", fmt::format("Pointer{}Speed", s_pointer_axis_names[axis]).c_str(), 40.0f) / + ui_ctrl_range * pointer_sensitivity; + s_pointer_axis_dead_zone[axis] = std::min( + si.GetFloatValue("Pad", fmt::format("Pointer{}DeadZone", s_pointer_axis_names[axis]).c_str(), 20.0f) / ui_ctrl_range, 1.0f); + s_pointer_axis_range[axis] = 1.0f - s_pointer_axis_dead_zone[axis]; } - s_pointer_inertia = si.GetFloatValue("Pad", fmt::format("PointerInertia").c_str(), 0.0f) / ui_ctrl_range; - s_pointer_pos = {0.0f, 0.0f}; + s_pointer_inertia = si.GetFloatValue("Pad", "PointerInertia", 10.0f) / ui_ctrl_range; + s_pointer_pos = {}; for (u32 port = 0; port < USB::NUM_PORTS; port++) AddUSBBindings(binding_si, port);