gered/sdl-wii
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add pitch/roll/yaw as axises

Browse source
This commit is contained in:
simon.kagstrom 2009-07-11 11:11:17 +00:00
parent 7617766f6c
commit 8b980fc7b0
1 changed files with 53 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
SDL/src/joystick/wii/SDL_sysjoystick.c
View file

@ -43,7 +43,7 @@
#define MAX_GC_BUTTONS 8 #define MAX_GC_BUTTONS 8
#define MAX_GC_HATS 1 #define MAX_GC_HATS 1
#define MAX_WII_AXES 6 #define MAX_WII_AXES 9
#define MAX_WII_BUTTONS 20 #define MAX_WII_BUTTONS 20
#define MAX_WII_HATS 1 #define MAX_WII_HATS 1
@ -74,6 +74,9 @@ typedef struct joystick_wpaddata_t
s8 classicR_stickY; s8 classicR_stickY;
u8 classic_triggerL; u8 classic_triggerL;
u8 classic_triggerR; u8 classic_triggerR;
s8 wiimote_pitch;
s8 wiimote_roll;
s8 wiimote_yaw;
}joystick_wpaddata; }joystick_wpaddata;
/* The private structure used to keep track of a joystick */ /* The private structure used to keep track of a joystick */
@ -205,6 +208,36 @@ int SDL_SYS_JoystickOpen(SDL_Joystick *joystick)
return(0); return(0);
} }
static s16 WPAD_Orient(u8 chan, int motion)
{
WPADData *data = WPAD_Data(chan);
float out;
if (motion == 0)
out = data->orient.pitch;
else if (motion == 1)
out = data->orient.roll;
else
out = data->orient.yaw;
return (s16)((out / 180.0) * 128.0);
}
static s16 WPAD_Pitch(u8 chan)
{
return WPAD_Orient(chan, 0);
}
static s16 WPAD_Roll(u8 chan)
{
return WPAD_Orient(chan, 1);
}
static s16 WPAD_Yaw(u8 chan)
{
return WPAD_Orient(chan, 2);
}
static s16 WPAD_Stick(u8 chan, u8 right, int axis) static s16 WPAD_Stick(u8 chan, u8 right, int axis)
{ {
float mag = 0.0; float mag = 0.0;
@ -379,6 +412,25 @@ static void _HandleWiiJoystickUpdate(SDL_Joystick* joystick)
prev_state->wiimote.nunchuk_stickY = axis; prev_state->wiimote.nunchuk_stickY = axis;
} }
} }
axis = WPAD_Pitch(joystick->index);
if(prev_state->wiimote.wiimote_pitch != axis)
{
SDL_PrivateJoystickAxis(joystick, 6, -(axis << 8));
prev_state->wiimote.wiimote_pitch = axis;
}
axis = WPAD_Roll(joystick->index);
if(prev_state->wiimote.wiimote_roll != axis)
{
SDL_PrivateJoystickAxis(joystick, 7, axis << 8);
prev_state->wiimote.wiimote_roll = axis;
}
axis = WPAD_Yaw(joystick->index);
if(prev_state->wiimote.wiimote_yaw != axis)
{
SDL_PrivateJoystickAxis(joystick, 8, axis << 8);
prev_state->wiimote.wiimote_yaw = axis;
}
} }
static void _HandleGCJoystickUpdate(SDL_Joystick* joystick) static void _HandleGCJoystickUpdate(SDL_Joystick* joystick)