Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-27 08:05:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CommonHostInterface: Scale full axis to half axis bindings

Browse source
This commit is contained in:
Connor McLaughlin 2021-07-03 21:09:10 +10:00
parent 4ddab3609d
commit 3da6c604d7
1 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/frontend-common/common_host_interface.cpp
View file

@ -1914,26 +1914,50 @@ bool CommonHostInterface::AddAxisToInputMap(const std::string& binding, const st
StringUtil::FromChars<int>(axis.substr(axis[0] == '+' || axis[0] == '-' ? 5 : 4)); StringUtil::FromChars<int>(axis.substr(axis[0] == '+' || axis[0] == '-' ? 5 : 4));
if (axis_index) if (axis_index)
{ {
const bool inverted = StringUtil::EndsWith(axis, "-");
ControllerInterface::AxisSide axis_side = ControllerInterface::AxisSide::Full; ControllerInterface::AxisSide axis_side = ControllerInterface::AxisSide::Full;
if (axis[0] == '+') if (axis[0] == '+')
axis_side = ControllerInterface::AxisSide::Positive;
else if (axis[0] == '-')
axis_side = ControllerInterface::AxisSide::Negative;
const bool inverted = StringUtil::EndsWith(axis, "-");
if (!inverted)
{ {
if (m_controller_interface->BindControllerAxis(*controller_index, *axis_index, axis_side, std::move(handler))) axis_side = ControllerInterface::AxisSide::Positive;
}
else if (axis[0] == '-')
{
axis_side = ControllerInterface::AxisSide::Negative;
}
if (axis_type == Controller::AxisType::Half && axis_side == ControllerInterface::Full)
{
// full axis [-1..1] -> half axis [0..1]
if (inverted)
{ {
return true; m_controller_interface->BindControllerAxis(
*controller_index, *axis_index, axis_side,
[cb = std::move(handler)](float value) { cb(((-value) + 1.0f) * 0.5f); });
}
else
{
m_controller_interface->BindControllerAxis(
*controller_index, *axis_index, axis_side,
[cb = std::move(handler)](float value) { cb((value + 1.0f) * 0.5f); });
} }
} }
else else
{ {
if (m_controller_interface->BindControllerAxis(*controller_index, *axis_index, axis_side, if (!inverted)
[cb = std::move(handler)](float value) { cb(-value); }))
{ {
return true; if (m_controller_interface->BindControllerAxis(*controller_index, *axis_index, axis_side,
std::move(handler)))
{
return true;
}
}
else
{
if (m_controller_interface->BindControllerAxis(*controller_index, *axis_index, axis_side,
[cb = std::move(handler)](float value) { cb(-value); }))
{
return true;
}
} }
} }
} }