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

input_common/sdl/sdl_impl: Amend names for axes for SDLAnalogPoller

Browse source 
Adds another underscore to clearly indicate the axis names.
This commit is contained in:
Lioncash 2019-06-03 16:32:57 -04:00
parent 50048d9f5a
commit b9b23c98ff
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -611,8 +611,8 @@ public:
SDLPoller::Start(); SDLPoller::Start();
// Reset stored axes // Reset stored axes
analog_xaxis = -1; analog_x_axis = -1;
analog_yaxis = -1; analog_y_axis = -1;
analog_axes_joystick = -1; analog_axes_joystick = -1;
} }
@ -625,24 +625,24 @@ public:
// An analog device needs two axes, so we need to store the axis for later and wait for // An analog device needs two axes, so we need to store the axis for later and wait for
// a second SDL event. The axes also must be from the same joystick. // a second SDL event. The axes also must be from the same joystick.
const int axis = event.jaxis.axis; const int axis = event.jaxis.axis;
if (analog_xaxis == -1) { if (analog_x_axis == -1) {
analog_xaxis = axis; analog_x_axis = axis;
analog_axes_joystick = event.jaxis.which; analog_axes_joystick = event.jaxis.which;
} else if (analog_yaxis == -1 && analog_xaxis != axis && } else if (analog_y_axis == -1 && analog_x_axis != axis &&
analog_axes_joystick == event.jaxis.which) { analog_axes_joystick == event.jaxis.which) {
analog_yaxis = axis; analog_y_axis = axis;
} }
} }
Common::ParamPackage params; Common::ParamPackage params;
if (analog_xaxis != -1 && analog_yaxis != -1) { if (analog_x_axis != -1 && analog_y_axis != -1) {
const auto joystick = state.GetSDLJoystickBySDLID(event.jaxis.which); const auto joystick = state.GetSDLJoystickBySDLID(event.jaxis.which);
params.Set("engine", "sdl"); params.Set("engine", "sdl");
params.Set("port", joystick->GetPort()); params.Set("port", joystick->GetPort());
params.Set("guid", joystick->GetGUID()); params.Set("guid", joystick->GetGUID());
params.Set("axis_x", analog_xaxis); params.Set("axis_x", analog_x_axis);
params.Set("axis_y", analog_yaxis); params.Set("axis_y", analog_y_axis);
analog_xaxis = -1; analog_x_axis = -1;
analog_yaxis = -1; analog_y_axis = -1;
analog_axes_joystick = -1; analog_axes_joystick = -1;
return params; return params;
} }
@ -650,8 +650,8 @@ public:
} }
private: private:
int analog_xaxis = -1; int analog_x_axis = -1;
int analog_yaxis = -1; int analog_y_axis = -1;
SDL_JoystickID analog_axes_joystick = -1; SDL_JoystickID analog_axes_joystick = -1;
}; };
} // namespace Polling } // namespace Polling