From 6a6195f53c0a369782599b56cdbcc803bcb4203e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 29 Dec 2018 13:56:35 -0600 Subject: ControllerEmu: Implement dead zone setting for triggers. --- .../ControllerEmu/ControlGroup/MixedTriggers.cpp | 51 +++++++++++++++++----- 1 file changed, 41 insertions(+), 10 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp index 8f26fde6fc..4928127604 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp @@ -4,6 +4,7 @@ #include "InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h" +#include #include #include #include @@ -21,23 +22,53 @@ MixedTriggers::MixedTriggers(const std::string& name_) : ControlGroup(name_, GroupType::MixedTriggers) { numeric_settings.emplace_back(std::make_unique(_trans("Threshold"), 0.9)); + numeric_settings.emplace_back(std::make_unique(_trans("Dead Zone"), 0.0, 0, 25)); } -void MixedTriggers::GetState(u16* const digital, const u16* bitmasks, ControlState* analog) +void MixedTriggers::GetState(u16* const digital, const u16* bitmasks, ControlState* analog, + bool adjusted) { - const size_t trigger_count = controls.size() / 2; + const ControlState threshold = numeric_settings[SETTING_THRESHOLD]->GetValue(); + ControlState deadzone = numeric_settings[SETTING_DEADZONE]->GetValue(); - for (size_t i = 0; i < trigger_count; ++i, ++bitmasks, ++analog) + // Return raw values. (used in UI) + if (!adjusted) { - if (controls[i]->control_ref->State() > numeric_settings[0]->GetValue()) // threshold - { - *analog = 1.0; - *digital |= *bitmasks; - } - else + deadzone = 0.0; + } + + const int trigger_count = int(controls.size() / 2); + for (int i = 0; i != trigger_count; ++i) + { + ControlState button_value = controls[i]->control_ref->State(); + ControlState analog_value = controls[trigger_count + i]->control_ref->State(); + + // Apply deadzone: + analog_value = std::max(0.0, analog_value - deadzone) / (1.0 - deadzone); + button_value = std::max(0.0, button_value - deadzone) / (1.0 - deadzone); + + // Apply threshold: + if (button_value > threshold) { - *analog = controls[i + trigger_count]->control_ref->State(); + // Fully activate analog: + analog_value = 1.0; + + // Activate button: + *digital |= bitmasks[i]; } + + analog[i] = analog_value; } } + +ControlState MixedTriggers::GetDeadzone() const +{ + return numeric_settings[SETTING_DEADZONE]->GetValue(); +} + +ControlState MixedTriggers::GetThreshold() const +{ + return numeric_settings[SETTING_THRESHOLD]->GetValue(); +} + } // namespace ControllerEmu -- cgit v1.2.3 From 7efa96eda979f5e717813e7c76cefb0720bc239a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 30 Dec 2018 10:52:45 -0600 Subject: ControllerEmu: code cleanup. --- Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp index 4928127604..6ae4dfd668 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp @@ -26,7 +26,7 @@ MixedTriggers::MixedTriggers(const std::string& name_) } void MixedTriggers::GetState(u16* const digital, const u16* bitmasks, ControlState* analog, - bool adjusted) + bool adjusted) const { const ControlState threshold = numeric_settings[SETTING_THRESHOLD]->GetValue(); ControlState deadzone = numeric_settings[SETTING_DEADZONE]->GetValue(); -- cgit v1.2.3