sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ControllerInterface: Move axis scaling into AnalogController class

Browse Source
This commit is contained in:
Albert Liu
2020-11-11 23:55:23 -08:00
parent ca14e53c4a
commit d87ab23fec
8 changed files with 7 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontend-common/sdl_controller_interface.cpp
View File

@ -320,8 +320,7 @@ bool SDLControllerInterface::HandleControllerAxisEvent(const SDL_Event* ev)
const AxisCallback& cb = it->axis_mapping[ev->caxis.axis];
if (cb)
{
// Apply axis scaling only when controller axis is mapped to an axis
cb(std::clamp(it->axis_scale * value, -1.0f, 1.0f));
cb(value);
return true;
}
@ -427,17 +426,6 @@ void SDLControllerInterface::SetControllerRumbleStrength(int controller_index, c
}
}
bool SDLControllerInterface::SetControllerAxisScale(int controller_index, float scale /* = 1.00f */)
{
auto it = GetControllerDataForPlayerId(controller_index);
if (it == m_controllers.end())
return false;
it->axis_scale = std::clamp(std::abs(scale), 0.01f, 1.50f);
Log_InfoPrintf("Controller %d axis scale set to %f", controller_index, it->axis_scale);
return true;
}
bool SDLControllerInterface::SetControllerDeadzone(int controller_index, float size /* = 0.25f */)
{
auto it = GetControllerDataForPlayerId(controller_index);