CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-13 22:08:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(GX) Take out all D-pad emulation code (and treating analog sticks

Browse Source 
as digital buttons) - will need to wait for the global solution
for D-pad emulation
This commit is contained in:
twinaphex 2013-10-07 16:19:32 +02:00
parent 37054f6a5c
commit d17faaca35
2 changed files with 1 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
gx/gx_input.c
View File

@ -57,22 +57,6 @@ const struct platform_bind platform_keys[] = {
{ GX_GC_START, "GC Start button" },
{ GX_GC_L_TRIGGER, "GC Left Trigger" },
{ GX_GC_R_TRIGGER, "GC Right Trigger" },
{ GX_GC_LSTICK_LEFT, "GC Main Stick Left" },
{ GX_GC_LSTICK_RIGHT, "GC Main Stick Right" },
{ GX_GC_LSTICK_UP, "GC Main Stick Up" },
{ GX_GC_LSTICK_DOWN, "GC Main Stick Down" },
{ GX_GC_LSTICK_LEFT | GX_GC_LEFT, "GC Main Stick D-Pad Left" },
{ GX_GC_LSTICK_RIGHT | GX_GC_RIGHT, "GC Main Stick D-Pad Right" },
{ GX_GC_LSTICK_UP | GX_GC_UP, "GC Main Stick D-Pad Up" },
{ GX_GC_LSTICK_DOWN | GX_GC_DOWN, "GC Main Stick D-Pad Down" },
{ GX_GC_RSTICK_LEFT, "GC C-Stick Left" },
{ GX_GC_RSTICK_RIGHT, "GC C-Stick Right" },
{ GX_GC_RSTICK_UP, "GC C-Stick Up" },
{ GX_GC_RSTICK_DOWN, "GC C-Stick Down" },
{ GX_GC_RSTICK_LEFT | GX_GC_LEFT, "GC C-Stick D-Pad Left" },
{ GX_GC_RSTICK_RIGHT | GX_GC_RIGHT, "GC C-Stick D-Pad Right" },
{ GX_GC_RSTICK_UP | GX_GC_UP, "GC C-Stick D-Pad Up" },
{ GX_GC_RSTICK_DOWN | GX_GC_DOWN, "GC C-Stick D-Pad Down" },
#ifdef HW_RVL
// CLASSIC CONTROLLER
@ -91,22 +75,6 @@ const struct platform_bind platform_keys[] = {
{ GX_CLASSIC_R_TRIGGER, "Classic R Trigger" },
{ GX_CLASSIC_ZL_TRIGGER, "Classic ZL Trigger" },
{ GX_CLASSIC_ZR_TRIGGER, "Classic ZR Trigger" },
{ GX_CLASSIC_LSTICK_LEFT, "Classic LStick Left" },
{ GX_CLASSIC_LSTICK_RIGHT, "Classic LStick Right" },
{ GX_CLASSIC_LSTICK_UP, "Classic LStick Up" },
{ GX_CLASSIC_LSTICK_DOWN, "Classic LStick Down" },
{ GX_CLASSIC_LSTICK_LEFT | GX_CLASSIC_LEFT, "Classic LStick D-Pad Left" },
{ GX_CLASSIC_LSTICK_RIGHT | GX_CLASSIC_RIGHT, "Classic LStick D-Pad Right" },
{ GX_CLASSIC_LSTICK_UP | GX_CLASSIC_UP, "Classic LStick D-Pad Up" },
{ GX_CLASSIC_LSTICK_DOWN | GX_CLASSIC_DOWN, "Classic LStick D-Pad Down" },
{ GX_CLASSIC_RSTICK_LEFT, "Classic RStick Left" },
{ GX_CLASSIC_RSTICK_RIGHT, "Classic RStick Right" },
{ GX_CLASSIC_RSTICK_UP, "Classic RStick Up" },
{ GX_CLASSIC_RSTICK_DOWN, "Classic RStick Down" },
{ GX_CLASSIC_RSTICK_LEFT | GX_CLASSIC_LEFT, "Classic RStick D-Pad Left" },
{ GX_CLASSIC_RSTICK_RIGHT | GX_CLASSIC_RIGHT, "Classic RStick D-Pad Right" },
{ GX_CLASSIC_RSTICK_UP | GX_CLASSIC_UP, "Classic RStick D-Pad Up" },
{ GX_CLASSIC_RSTICK_DOWN | GX_CLASSIC_DOWN, "Classic RStick D-Pad Down" },
// WIIMOTE (PLUS OPTIONAL NUNCHUK)
{ GX_WIIMOTE_A, "Wiimote A button" },
@ -126,10 +94,6 @@ const struct platform_bind platform_keys[] = {
{ GX_NUNCHUK_RIGHT, "Nunchuk Stick Right" },
{ GX_NUNCHUK_UP, "Nunchuk Stick Up" },
{ GX_NUNCHUK_DOWN, "Nunchuk Stick Down" },
{ GX_NUNCHUK_LEFT | GX_WIIMOTE_LEFT, "Nunchuk Stick D-Pad Left" },
{ GX_NUNCHUK_RIGHT | GX_WIIMOTE_RIGHT, "Nunchuk Stick D-Pad Right" },
{ GX_NUNCHUK_UP | GX_WIIMOTE_UP, "Nunchuk Stick D-Pad Up" },
{ GX_NUNCHUK_DOWN | GX_WIIMOTE_DOWN, "Nunchuk Stick D-Pad Down" },
#endif
};
@ -434,16 +398,6 @@ static void gx_input_poll(void *data)
analog_state[port][RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_Y] = ls_y;
analog_state[port][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_X] = rs_x;
analog_state[port][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_Y] = rs_y;
*state_cur |= (ls_x > WII_JOYSTICK_THRESHOLD) ? GX_CLASSIC_LSTICK_RIGHT : 0;
*state_cur |= (ls_x < -WII_JOYSTICK_THRESHOLD) ? GX_CLASSIC_LSTICK_LEFT : 0;
*state_cur |= (ls_y < -WII_JOYSTICK_THRESHOLD) ? GX_CLASSIC_LSTICK_UP : 0;
*state_cur |= (ls_y > WII_JOYSTICK_THRESHOLD) ? GX_CLASSIC_LSTICK_DOWN : 0;
*state_cur |= (rs_x > WII_JOYSTICK_THRESHOLD) ? GX_CLASSIC_RSTICK_RIGHT : 0;
*state_cur |= (rs_x < -WII_JOYSTICK_THRESHOLD) ? GX_CLASSIC_RSTICK_LEFT: 0;
*state_cur |= (rs_y < -WII_JOYSTICK_THRESHOLD) ? GX_CLASSIC_RSTICK_UP : 0;
*state_cur |= (rs_y > WII_JOYSTICK_THRESHOLD) ? GX_CLASSIC_RSTICK_DOWN : 0;
}
else if (type == WPAD_EXP_NUNCHUK)
{
@ -472,11 +426,6 @@ static void gx_input_poll(void *data)
analog_state[port][RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_X] = x;
analog_state[port][RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_Y] = y;
*state_cur |= (x > WII_JOYSTICK_THRESHOLD) ? GX_NUNCHUK_RIGHT : 0;
*state_cur |= (x < -WII_JOYSTICK_THRESHOLD) ? GX_NUNCHUK_LEFT : 0;
*state_cur |= (y < -WII_JOYSTICK_THRESHOLD) ? GX_NUNCHUK_UP : 0;
*state_cur |= (y > WII_JOYSTICK_THRESHOLD) ? GX_NUNCHUK_DOWN : 0;
}
}
#endif
@ -508,17 +457,7 @@ static void gx_input_poll(void *data)
analog_state[port][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_X] = rs_x;
analog_state[port][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_Y] = rs_y;
*state_cur |= (ls_x < -GC_JOYSTICK_THRESHOLD) ? GX_GC_LSTICK_LEFT : 0;
*state_cur |= (ls_x > GC_JOYSTICK_THRESHOLD) ? GX_GC_LSTICK_RIGHT : 0;
*state_cur |= (ls_y > GC_JOYSTICK_THRESHOLD) ? GX_GC_LSTICK_DOWN : 0;
*state_cur |= (ls_y < -GC_JOYSTICK_THRESHOLD) ? GX_GC_LSTICK_UP : 0;
*state_cur |= (rs_x < -GC_JOYSTICK_THRESHOLD) ? GX_GC_RSTICK_LEFT : 0;
*state_cur |= (rs_x > GC_JOYSTICK_THRESHOLD) ? GX_GC_RSTICK_RIGHT : 0;
*state_cur |= (rs_y > GC_JOYSTICK_THRESHOLD) ? GX_GC_RSTICK_DOWN : 0;
*state_cur |= (rs_y < -GC_JOYSTICK_THRESHOLD) ? GX_GC_RSTICK_UP : 0;
if ((*state_cur & (GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_GC_L_TRIGGER | GX_GC_R_TRIGGER)) == (GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_GC_L_TRIGGER | GX_GC_R_TRIGGER))
if ((*state_cur & (GX_GC_START | GX_GC_Z_TRIGGER | GX_GC_L_TRIGGER | GX_GC_R_TRIGGER)) == (GX_GC_START | GX_GC_Z_TRIGGER | GX_GC_L_TRIGGER | GX_GC_R_TRIGGER))
*state_cur |= GX_WIIMOTE_HOME;
}
}
@ -536,49 +475,6 @@ static void gx_input_poll(void *data)
(1ULL << RARCH_QUIT_KEY) |
(1ULL << RARCH_MENU_TOGGLE));
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_DOWN) && !(*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_DOWN) && !(*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_FAST_FORWARD_HOLD_KEY);
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_UP) && (*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_UP) && (*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_LOAD_STATE_KEY);
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_DOWN) && (*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_DOWN) && (*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_SAVE_STATE_KEY);
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_RIGHT) && (*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_RIGHT) && (*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_STATE_SLOT_PLUS);
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_LEFT) && (*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_LEFT) && (*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_STATE_SLOT_MINUS);
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_UP) && !(*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_UP) && !(*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_REWIND);
if (g_menu)
{
*state_p1 |= GX_WIIMOTE_HOME;

56
gx/gx_input.h
View File

@ -32,14 +32,6 @@ enum
GX_GC_DOWN = 1ULL << 9,
GX_GC_LEFT = 1ULL << 10,
GX_GC_RIGHT = 1ULL << 11,
GX_GC_LSTICK_UP = 1ULL << 12,
GX_GC_LSTICK_DOWN = 1ULL << 13,
GX_GC_LSTICK_LEFT = 1ULL << 14,
GX_GC_LSTICK_RIGHT = 1ULL << 15,
GX_GC_RSTICK_UP = 1ULL << 16,
GX_GC_RSTICK_DOWN = 1ULL << 17,
GX_GC_RSTICK_LEFT = 1ULL << 18,
GX_GC_RSTICK_RIGHT = 1ULL << 19,
#ifdef HW_RVL
GX_CLASSIC_A = 1ULL << 20,
GX_CLASSIC_B = 1ULL << 21,
@ -56,14 +48,6 @@ enum
GX_CLASSIC_DOWN = 1ULL << 32,
GX_CLASSIC_LEFT = 1ULL << 33,
GX_CLASSIC_RIGHT = 1ULL << 34,
GX_CLASSIC_LSTICK_UP = 1ULL << 35,
GX_CLASSIC_LSTICK_DOWN = 1ULL << 36,
GX_CLASSIC_LSTICK_LEFT = 1ULL << 37,
GX_CLASSIC_LSTICK_RIGHT = 1ULL << 38,
GX_CLASSIC_RSTICK_UP = 1ULL << 39,
GX_CLASSIC_RSTICK_DOWN = 1ULL << 40,
GX_CLASSIC_RSTICK_LEFT = 1ULL << 41,
GX_CLASSIC_RSTICK_RIGHT = 1ULL << 42,
GX_WIIMOTE_A = 1ULL << 43,
GX_WIIMOTE_B = 1ULL << 44,
GX_WIIMOTE_1 = 1ULL << 45,
@ -100,22 +84,6 @@ enum gx_device_id
GX_DEVICE_GC_ID_JOYPAD_START,
GX_DEVICE_GC_ID_JOYPAD_L_TRIGGER,
GX_DEVICE_GC_ID_JOYPAD_R_TRIGGER,
GX_DEVICE_GC_ID_LSTICK_LEFT,
GX_DEVICE_GC_ID_LSTICK_RIGHT,
GX_DEVICE_GC_ID_LSTICK_UP,
GX_DEVICE_GC_ID_LSTICK_DOWN,
GX_DEVICE_GC_ID_LSTICK_LEFT_DPAD,
GX_DEVICE_GC_ID_LSTICK_RIGHT_DPAD,
GX_DEVICE_GC_ID_LSTICK_UP_DPAD,
GX_DEVICE_GC_ID_LSTICK_DOWN_DPAD,
GX_DEVICE_GC_ID_RSTICK_LEFT,
GX_DEVICE_GC_ID_RSTICK_RIGHT,
GX_DEVICE_GC_ID_RSTICK_UP,
GX_DEVICE_GC_ID_RSTICK_DOWN,
GX_DEVICE_GC_ID_RSTICK_LEFT_DPAD,
GX_DEVICE_GC_ID_RSTICK_RIGHT_DPAD,
GX_DEVICE_GC_ID_RSTICK_UP_DPAD,
GX_DEVICE_GC_ID_RSTICK_DOWN_DPAD,
#ifdef HW_RVL
// CLASSIC CONTROLLER
@ -134,22 +102,6 @@ enum gx_device_id
GX_DEVICE_CLASSIC_ID_JOYPAD_R_TRIGGER,
GX_DEVICE_CLASSIC_ID_JOYPAD_ZL_TRIGGER,
GX_DEVICE_CLASSIC_ID_JOYPAD_ZR_TRIGGER,
GX_DEVICE_CLASSIC_ID_LSTICK_LEFT,
GX_DEVICE_CLASSIC_ID_LSTICK_RIGHT,
GX_DEVICE_CLASSIC_ID_LSTICK_UP,
GX_DEVICE_CLASSIC_ID_LSTICK_DOWN,
GX_DEVICE_CLASSIC_ID_LSTICK_LEFT_DPAD,
GX_DEVICE_CLASSIC_ID_LSTICK_RIGHT_DPAD,
GX_DEVICE_CLASSIC_ID_LSTICK_UP_DPAD,
GX_DEVICE_CLASSIC_ID_LSTICK_DOWN_DPAD,
GX_DEVICE_CLASSIC_ID_RSTICK_LEFT,
GX_DEVICE_CLASSIC_ID_RSTICK_RIGHT,
GX_DEVICE_CLASSIC_ID_RSTICK_UP,
GX_DEVICE_CLASSIC_ID_RSTICK_DOWN,
GX_DEVICE_CLASSIC_ID_RSTICK_LEFT_DPAD,
GX_DEVICE_CLASSIC_ID_RSTICK_RIGHT_DPAD,
GX_DEVICE_CLASSIC_ID_RSTICK_UP_DPAD,
GX_DEVICE_CLASSIC_ID_RSTICK_DOWN_DPAD,
// WIIMOTE (PLUS OPTIONAL NUNCHUK)
GX_DEVICE_WIIMOTE_ID_JOYPAD_A,
@ -165,14 +117,6 @@ enum gx_device_id
GX_DEVICE_WIIMOTE_ID_JOYPAD_HOME,
GX_DEVICE_WIIMOTE_ID_JOYPAD_Z,
GX_DEVICE_WIIMOTE_ID_JOYPAD_C,
GX_DEVICE_WIIMOTE_ID_LSTICK_LEFT,
GX_DEVICE_WIIMOTE_ID_LSTICK_RIGHT,
GX_DEVICE_WIIMOTE_ID_LSTICK_UP,
GX_DEVICE_WIIMOTE_ID_LSTICK_DOWN,
GX_DEVICE_WIIMOTE_ID_LSTICK_LEFT_DPAD,
GX_DEVICE_WIIMOTE_ID_LSTICK_RIGHT_DPAD,
GX_DEVICE_WIIMOTE_ID_LSTICK_UP_DPAD,
GX_DEVICE_WIIMOTE_ID_LSTICK_DOWN_DPAD,
#endif
RARCH_LAST_PLATFORM_KEY