CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-26 05:16:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Implement AXIS_HAT_X/Y as actual hats.

Browse Source 
Fixes d-pad emulation on Shield.
This commit is contained in:
Themaister 2014-06-11 16:01:59 +02:00
parent 50ac407a9a
commit 42858cd3a1
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
input/android_input.c
View File

@ -203,6 +203,7 @@ typedef struct android_input
unsigned pads_connected;
int state_device_ids[MAX_PADS];
uint8_t pad_state[MAX_PADS][(LAST_KEYCODE + 7) / 8];
int8_t hat_state[MAX_PADS][2];
int16_t analog_state[MAX_PADS][MAX_AXIS];
sensor_t accelerometer_state;
@ -273,13 +274,16 @@ static void engine_handle_dpad_getaxisvalue(void *data, AInputEvent *event,
float brake = AMotionEvent_getAxisValue(event, AXIS_BRAKE, motion_pointer);
float gas = AMotionEvent_getAxisValue(event, AXIS_GAS, motion_pointer);
android->hat_state[port][0] = (int)hatx;
android->hat_state[port][1] = (int)haty;
// XXX: this could be a loop instead, but do we really want to loop through every axis?
android->analog_state[port][0] = (int16_t)(x * 32767.0f);
android->analog_state[port][1] = (int16_t)(y * 32767.0f);
android->analog_state[port][2] = (int16_t)(z * 32767.0f);
android->analog_state[port][3] = (int16_t)(rz * 32767.0f);
android->analog_state[port][4] = (int16_t)(hatx * 32767.0f);
android->analog_state[port][5] = (int16_t)(haty * 32767.0f);
//android->analog_state[port][4] = (int16_t)(hatx * 32767.0f);
//android->analog_state[port][5] = (int16_t)(haty * 32767.0f);
android->analog_state[port][6] = (int16_t)(ltrig * 32767.0f);
android->analog_state[port][7] = (int16_t)(rtrig * 32767.0f);
android->analog_state[port][8] = (int16_t)(brake * 32767.0f);
@ -944,10 +948,25 @@ static bool android_joypad_button(unsigned port_num, uint16_t joykey)
{
android_input_t *android = (android_input_t*)driver.input_data;
if (!android || port_num >= MAX_PADS || joykey >= LAST_KEYCODE)
if (!android || port_num >= MAX_PADS)
return false;
return get_bit(android->pad_state[port_num], joykey);
if (GET_HAT_DIR(joykey))
{
unsigned h = GET_HAT(joykey);
if (h > 0)
return false;
switch (GET_HAT_DIR(joykey))
{
case HAT_LEFT_MASK: return android->hat_state[port_num][0] == -1;
case HAT_RIGHT_MASK: return android->hat_state[port_num][0] == 1;
case HAT_UP_MASK: return android->hat_state[port_num][1] == -1;
case HAT_DOWN_MASK: return android->hat_state[port_num][1] == 1;
default: return false;
}
}
else
return joykey < LAST_KEYCODE && get_bit(android->pad_state[port_num], joykey);
}
static int16_t android_joypad_axis(unsigned port_num, uint32_t joyaxis)

8
input/autoconf/builtin_android.c
View File

@ -23,10 +23,10 @@ DECL_BTN(x, 100) \
DECL_BTN(y, 99) \
DECL_BTN(start, 107) \
DECL_BTN(select, 106) \
DECL_AXIS(up, -5) \
DECL_AXIS(down, +5) \
DECL_AXIS(left, -4) \
DECL_AXIS(right, +4) \
DECL_BTN(up, h0up) \
DECL_BTN(down, h0down) \
DECL_BTN(left, h0left) \
DECL_BTN(right, h0right) \
DECL_BTN(l, 102) \
DECL_BTN(r, 103) \
DECL_AXIS(l2, +6) \