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

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

View File

@ -40,9 +40,7 @@ AnalogStick::ReshapeData AnalogStick::GetReshapableState(bool adjusted) const
if (!adjusted)
return {x, y};
const ControlState modifier = controls[4]->GetState();
return Reshape(x, y, modifier);
return Reshape(x, y, GetModifierInput()->GetState());
}
AnalogStick::StateData AnalogStick::GetState() const
@ -55,6 +53,11 @@ ControlState AnalogStick::GetGateRadiusAtAngle(double ang) const
return m_stick_gate->GetRadiusAtAngle(ang);
}
Control* AnalogStick::GetModifierInput() const
{
return controls[4].get();
}
OctagonAnalogStick::OctagonAnalogStick(const char* name_, ControlState gate_radius)
: OctagonAnalogStick(name_, name_, gate_radius)
{