yuzu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline.git synced 2024-12-25 01:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7142 from german77/sdl_range

Browse source 
input_common/sdl: Fix joystick range
This commit is contained in:
bunnei 2021-10-13 15:15:18 -07:00 committed by GitHub
parent 9f0f827db4 8212a864ca
commit 2643752f93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/input_common/sdl/sdl_impl.cpp
View file

@ -170,7 +170,8 @@ public:
float GetAxis(int axis, float range, float offset) const { float GetAxis(int axis, float range, float offset) const {
std::lock_guard lock{mutex}; std::lock_guard lock{mutex};
const float value = static_cast<float>(state.axes.at(axis)) / 32767.0f; const float value = static_cast<float>(state.axes.at(axis)) / 32767.0f;
return (value + offset) / range; const float offset_scale = (value + offset) > 0.0f ? 1.0f + offset : 1.0f - offset;
return (value + offset) / range / offset_scale;
} }
bool RumblePlay(u16 amp_low, u16 amp_high) { bool RumblePlay(u16 amp_low, u16 amp_high) {
@ -789,8 +790,8 @@ public:
const std::string invert_y_value = params.Get("invert_y", "+"); const std::string invert_y_value = params.Get("invert_y", "+");
const bool invert_x = invert_x_value == "-"; const bool invert_x = invert_x_value == "-";
const bool invert_y = invert_y_value == "-"; const bool invert_y = invert_y_value == "-";
const float offset_x = params.Get("offset_x", 0.0f); const float offset_x = std::clamp(params.Get("offset_x", 0.0f), -0.99f, 0.99f);
const float offset_y = params.Get("offset_y", 0.0f); const float offset_y = std::clamp(params.Get("offset_y", 0.0f), -0.99f, 0.99f);
auto joystick = state.GetSDLJoystickByGUID(guid, port); auto joystick = state.GetSDLJoystickByGUID(guid, port);
// This is necessary so accessing GetAxis with axis_x and axis_y won't crash // This is necessary so accessing GetAxis with axis_x and axis_y won't crash