ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13124 from jordan-woyak/trigger-threshold-99 

ControllerEmu: Change trigger threshold check to prevent user error.
This commit is contained in:
Tilka 2024-10-12 09:34:53 +01:00 committed by GitHub
parent 67e8f37c5b ccdce615ec
commit 9eb0429c2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp
View File

@ -28,7 +28,7 @@ MixedTriggers::MixedTriggers(const std::string& name_)
_trans("%"), _trans("%"),
// i18n: Refers to the "threshold" setting for pressure sensitive gamepad inputs. // i18n: Refers to the "threshold" setting for pressure sensitive gamepad inputs.
_trans("Input strength required for activation.")}, _trans("Input strength required for activation.")},
90, 0, 100); 90, 1, 100);
} }
void MixedTriggers::GetState(u16* const digital, const u16* bitmasks, ControlState* analog, void MixedTriggers::GetState(u16* const digital, const u16* bitmasks, ControlState* analog,
@ -51,7 +51,7 @@ void MixedTriggers::GetState(u16* const digital, const u16* bitmasks, ControlSta
std::min(ApplyDeadzone(controls[trigger_count + i]->GetState(), deadzone), 1.0); std::min(ApplyDeadzone(controls[trigger_count + i]->GetState(), deadzone), 1.0);
// Apply threshold: // Apply threshold:
if (button_value > threshold) if (button_value >= threshold)
{ {
// Fully activate analog: // Fully activate analog:
analog_value = 1.0; analog_value = 1.0;
@ -87,7 +87,7 @@ void MixedTriggers::GetState(u16* digital, const u16* bitmasks, ControlState* an
ControlState analog_value = ApplyDeadzone(controls[trigger_count + i]->GetState(), deadzone); ControlState analog_value = ApplyDeadzone(controls[trigger_count + i]->GetState(), deadzone);
// Apply threshold: // Apply threshold:
if (button_value > threshold) if (button_value >= threshold)
{ {
analog_value = 1.0; analog_value = 1.0;
button_bool = true; button_bool = true;