piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon: Use value of "Modifier" button "Range" setting rather than always applying 50%.

Browse Source 
Make "Clear" button reset "Modifier" "Range" settings to 50%.
This commit is contained in:
Jordan Woyak
2022-01-04 14:09:50 -06:00
parent 953eb49cd8
commit 78a9bdf04a
7 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/InputCommon/ControllerEmu/StickGate.cpp
View File

@ -232,6 +232,15 @@ void ReshapableInput::LoadConfig(IniFile::Section* section, const std::string& d
ControlGroup::LoadConfig(section, default_device, base_name);
const std::string group(base_name + name + '/');
// Special handling for "Modifier" button "Range" settings which default to 50% instead of 100%.
if (const auto* modifier_input = GetModifierInput())
{
section->Get(group + modifier_input->name + "/Range", &modifier_input->control_ref->range,
50.0);
modifier_input->control_ref->range /= 100;
}
std::string load_str;
section->Get(group + CALIBRATION_CONFIG_NAME, &load_str, "");
const auto load_data = SplitString(load_str, ' ');
@ -313,11 +322,7 @@ ReshapableInput::ReshapeData ReshapableInput::Reshape(ControlState x, ControlSta
// This is affected by the modifier's "range" setting which defaults to 50%.
if (modifier)
{
// TODO: Modifier's range setting gets reset to 100% when the clear button is clicked.
// This causes the modifier to not behave how a user might suspect.
// Retaining the old scale-by-50% behavior until range is fixed to clear to 50%.
dist *= 0.5;
// dist *= modifier;
dist *= modifier;
}
// Apply deadzone as a percentage of the user-defined calibration shape/size:
@ -330,4 +335,9 @@ ReshapableInput::ReshapeData ReshapableInput::Reshape(ControlState x, ControlSta
std::clamp(std::sin(angle) * dist, -clamp, clamp)};
}
Control* ReshapableInput::GetModifierInput() const
{
return nullptr;
}
} // namespace ControllerEmu