mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-05 01:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ControllerInterface: Rename full surface analog inputs to be more visually dissimilar from their underlying inputs. e.g. "Full Axis X+".

Browse source
This commit is contained in:
Jordan Woyak 2019-03-13 19:47:52 -05:00
parent 241166a1a5
commit be897b41a7
2 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/Core/InputCommon/ControllerInterface/Device.cpp
View file

@ -55,7 +55,7 @@ Device::Input* Device::FindInput(const std::string& name) const
{
for (Input* input : m_inputs)
{
if (input->GetName() == name)
if (input->IsMatchingName(name))
return input;
}
@ -66,18 +66,42 @@ Device::Output* Device::FindOutput(const std::string& name) const
{
for (Output* output : m_outputs)
{
if (output->GetName() == name)
if (output->IsMatchingName(name))
return output;
}
return nullptr;
}
bool Device::Control::IsMatchingName(const std::string& name) const
{
return GetName() == name;
}
ControlState Device::FullAnalogSurface::GetState() const
{
return (1 + std::max(0.0, m_high.GetState()) - std::max(0.0, m_low.GetState())) / 2;
}
std::string Device::FullAnalogSurface::GetName() const
{
// E.g. "Full Axis X+"
return "Full " + m_high.GetName();
}
bool Device::FullAnalogSurface::IsMatchingName(const std::string& name) const
{
if (Control::IsMatchingName(name))
return true;
// Old naming scheme was "Axis X-+" which is too visually similar to "Axis X+".
// This has caused countless problems for users with mysterious misconfigurations.
// We match this old name to support old configurations.
const auto old_name = m_low.GetName() + *m_high.GetName().rbegin();
return old_name == name;
}
//
// DeviceQualifier :: ToString
//