Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

EvdevInputControllerInterface: Support half axis bindings

Browse source
This commit is contained in:
Connor McLaughlin 2021-07-03 15:03:36 +10:00
parent b5baee7c8c
commit 895f4d6fea
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/frontend-common/evdev_controller_interface.cpp
View file

@ -303,7 +303,10 @@ bool EvdevControllerInterface::BindControllerButtonToAxis(int controller_index,
bool EvdevControllerInterface::HandleAxisEvent(ControllerData* cd, u32 axis, s32 value) bool EvdevControllerInterface::HandleAxisEvent(ControllerData* cd, u32 axis, s32 value)
{ {
const ControllerData::Axis& ad = cd->axes[axis]; const ControllerData::Axis& ad = cd->axes[axis];
const float f_value = ((static_cast<float>(value - ad.min) / ad.range) * 2.0f) - 1.0f; float f_value = (static_cast<float>(value - ad.min) / static_cast<float>(ad.range));
if (ad.min < 0)
f_value = (f_value * 2.0f) - 1.0f;
Log_DevPrintf("controller %u axis %u %d %f range %d", cd->controller_id, axis, value, f_value, ad.range); Log_DevPrintf("controller %u axis %u %d %f range %d", cd->controller_id, axis, value, f_value, ad.range);
if (DoEventHook(Hook::Type::Axis, cd->controller_id, axis, f_value)) if (DoEventHook(Hook::Type::Axis, cd->controller_id, axis, f_value))
@ -315,6 +318,20 @@ bool EvdevControllerInterface::HandleAxisEvent(ControllerData* cd, u32 axis, s32
cb(f_value); cb(f_value);
return true; return true;
} }
else
{
const AxisCallback& positive_cb = ad.callback[AxisSide::Positive];
const AxisCallback& negative_cb = ad.callback[AxisSide::Negative];
if (positive_cb || negative_cb)
{
if (positive_cb)
positive_cb((f_value < 0.0f) ? 0.0f : f_value);
if (negative_cb)
negative_cb((f_value >= 0.0f) ? 0.0f : -f_value);
return true;
}
}
// set the other direction to false so large movements don't leave the opposite on // set the other direction to false so large movements don't leave the opposite on
const bool outside_deadzone = (std::abs(f_value) >= cd->deadzone); const bool outside_deadzone = (std::abs(f_value) >= cd->deadzone);