zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Instead of a huge switch statement, lets convert POV to axes by bitwise operations since we later assume we can do that for the button mapping anyways.

Browse source 
SVN r3609 (trunk)
This commit is contained in:
Braden Obrzut 2012-05-01 01:53:59 +00:00
parent c676f97fd8
commit 9e26f3b7a4
1 changed files with 15 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/sdl/i_joystick.cpp
View file

@ -170,45 +170,21 @@ public:
AxisInfo &y = Axes[NumAxes + i*2 + 1];
buttonstate = SDL_JoystickGetHat(Device, i);
switch(buttonstate)
{
case SDL_HAT_LEFTUP:
x.Value = -1.0;
y.Value = -1.0;
break;
case SDL_HAT_LEFT:
x.Value = -1.0;
y.Value = 0.0;
break;
case SDL_HAT_LEFTDOWN:
x.Value = -1.0;
y.Value = 1.0;
break;
case SDL_HAT_RIGHTUP:
x.Value = 1.0;
y.Value = -1.0;
break;
case SDL_HAT_RIGHT:
x.Value = 1.0;
y.Value = 0.0;
break;
case SDL_HAT_RIGHTDOWN:
x.Value = 1.0;
y.Value = 1.0;
break;
case SDL_HAT_UP:
x.Value = 0.0;
y.Value = -1.0;
break;
case SDL_HAT_DOWN:
x.Value = 0.0;
y.Value = 1.0;
break;
default:
x.Value = 0.0;
y.Value = 0.0;
break;
}
// If we're going to assume that we can pass SDL's value into
// Joy_GenerateButtonEvents then we might as well assume the format here.
if(buttonstate & 0x1) // Up
y.Value = -1.0;
else if(buttonstate & 0x4) // Down
y.Value = 1.0;
else
y.Value = 0.0;
if(buttonstate & 0x2) // Left
x.Value = 1.0;
else if(buttonstate & 0x8) // Right
x.Value = -1.0;
else
x.Value = 0.0;
if(i < 4)
{