ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Handle inverted+negated axes when mapping

This commit is contained in:
Stenzek 2025-02-28 18:06:43 +10:00
parent ec7c83a58e
commit be970bcfe4
No known key found for this signature in database
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/fullscreen_ui.cpp
View File

@ -2270,7 +2270,8 @@ void FullscreenUI::BeginInputBinding(SettingsInterface* bsi, InputBindingInfo::T
} }
const float abs_value = std::abs(value); const float abs_value = std::abs(value);
const bool reverse_threshold = (key.source_subtype == InputSubclass::ControllerAxis && initial_value > 0.5f); const bool reverse_threshold =
(key.source_subtype == InputSubclass::ControllerAxis && std::abs(initial_value) > 0.5f);
for (InputBindingKey& other_key : s_state.input_binding_new_bindings) for (InputBindingKey& other_key : s_state.input_binding_new_bindings)
{ {
@ -2305,7 +2306,7 @@ void FullscreenUI::BeginInputBinding(SettingsInterface* bsi, InputBindingInfo::T
if ((reverse_threshold ? (abs_value < 0.5f) : (abs_value >= 0.5f))) if ((reverse_threshold ? (abs_value < 0.5f) : (abs_value >= 0.5f)))
{ {
InputBindingKey key_to_add = key; InputBindingKey key_to_add = key;
key_to_add.modifier = (value < 0.0f && !reverse_threshold) ? InputModifier::Negate : InputModifier::None; key_to_add.modifier = (value < 0.0f) ? InputModifier::Negate : InputModifier::None;
key_to_add.invert = reverse_threshold; key_to_add.invert = reverse_threshold;
s_state.input_binding_new_bindings.push_back(key_to_add); s_state.input_binding_new_bindings.push_back(key_to_add);
} }

5
src/duckstation-qt/inputbindingdialog.cpp
View File

@ -306,7 +306,8 @@ void InputBindingDialog::inputManagerHookCallback(InputBindingKey key, float val
} }
const float abs_value = std::abs(value); const float abs_value = std::abs(value);
const bool reverse_threshold = (key.source_subtype == InputSubclass::ControllerAxis && initial_value > 0.5f); const bool reverse_threshold =
(key.source_subtype == InputSubclass::ControllerAxis && std::abs(initial_value) > 0.5f);
for (InputBindingKey& other_key : m_new_bindings) for (InputBindingKey& other_key : m_new_bindings)
{ {
@ -334,7 +335,7 @@ void InputBindingDialog::inputManagerHookCallback(InputBindingKey key, float val
if ((reverse_threshold ? (abs_value < 0.5f) : (abs_value >= 0.5f))) if ((reverse_threshold ? (abs_value < 0.5f) : (abs_value >= 0.5f)))
{ {
InputBindingKey key_to_add = key; InputBindingKey key_to_add = key;
key_to_add.modifier = (value < 0.0f && !reverse_threshold) ? InputModifier::Negate : InputModifier::None; key_to_add.modifier = (value < 0.0f) ? InputModifier::Negate : InputModifier::None;
key_to_add.invert = reverse_threshold; key_to_add.invert = reverse_threshold;
m_new_bindings.push_back(key_to_add); m_new_bindings.push_back(key_to_add);
} }

5
src/duckstation-qt/inputbindingwidgets.cpp
View File

@ -346,7 +346,8 @@ void InputBindingWidget::inputManagerHookCallback(InputBindingKey key, float val
} }
const float abs_value = std::abs(value); const float abs_value = std::abs(value);
const bool reverse_threshold = (key.source_subtype == InputSubclass::ControllerAxis && initial_value > 0.5f); const bool reverse_threshold =
(key.source_subtype == InputSubclass::ControllerAxis && std::abs(initial_value) > 0.5f);
for (InputBindingKey& other_key : m_new_bindings) for (InputBindingKey& other_key : m_new_bindings)
{ {
@ -374,7 +375,7 @@ void InputBindingWidget::inputManagerHookCallback(InputBindingKey key, float val
if ((reverse_threshold ? (abs_value < 0.5f) : (abs_value >= 0.5f))) if ((reverse_threshold ? (abs_value < 0.5f) : (abs_value >= 0.5f)))
{ {
InputBindingKey key_to_add = key; InputBindingKey key_to_add = key;
key_to_add.modifier = (value < 0.0f && !reverse_threshold) ? InputModifier::Negate : InputModifier::None; key_to_add.modifier = (value < 0.0f) ? InputModifier::Negate : InputModifier::None;
key_to_add.invert = reverse_threshold; key_to_add.invert = reverse_threshold;
m_new_bindings.push_back(key_to_add); m_new_bindings.push_back(key_to_add);
} }