ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Android) Input control improvements

This commit is contained in:
twinaphex 2012-10-30 05:57:12 +01:00
parent fb25f31598
commit c2f49f1c53
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
android/native/jni/input_android.c
View File

@ -232,6 +232,11 @@ rarch_android_bind_t android_binds_keyboard[] = {
static unsigned pads_connected; static unsigned pads_connected;
static android_input_state_t state[MAX_PADS]; static android_input_state_t state[MAX_PADS];
#define PRESSED_UP(x, y) ((-0.80f > y) && (x >= -1.00f))
#define PRESSED_DOWN(x, y) ((0.80f < y) && (y <= 1.00f))
#define PRESSED_LEFT(x, y) ((-0.80f > x) && (x >= -1.00f))
#define PRESSED_RIGHT(x, y) ((0.80f < x) && (x <= 1.00f))
static int32_t engine_handle_input(struct android_app* app, AInputEvent* event) static int32_t engine_handle_input(struct android_app* app, AInputEvent* event)
{ {
int id, i; int id, i;
@ -241,7 +246,7 @@ static int32_t engine_handle_input(struct android_app* app, AInputEvent* event)
for (i = 0; i < pads_connected; i++) for (i = 0; i < pads_connected; i++)
{ {
if (id == state[i].id) if (state[i].id == id)
{ {
found_existing_id = true; found_existing_id = true;
break; break;
@ -257,13 +262,9 @@ static int32_t engine_handle_input(struct android_app* app, AInputEvent* event)
{ {
bool do_keydown = false; bool do_keydown = false;
bool do_keyrelease = false; bool do_keyrelease = false;
bool pressed_left, pressed_right, pressed_up, pressed_down; int action = AKEY_EVENT_NO_ACTION;
float x, y; int type = AInputEvent_getType(event);
int action, keycode, type; int keycode = AKeyEvent_getKeyCode(event);
action = AKEY_EVENT_NO_ACTION;
type = AInputEvent_getType(event);
keycode = AKeyEvent_getKeyCode(event);
#ifdef RARCH_INPUT_DEBUG #ifdef RARCH_INPUT_DEBUG
int source = AInputEvent_getSource(event); int source = AInputEvent_getSource(event);
@ -291,27 +292,21 @@ static int32_t engine_handle_input(struct android_app* app, AInputEvent* event)
action = AKeyEvent_getAction(event); action = AKeyEvent_getAction(event);
switch(type) if(type == AINPUT_EVENT_TYPE_MOTION)
{ {
case AINPUT_EVENT_TYPE_MOTION: float x = AMotionEvent_getX(event, 0);
x = AMotionEvent_getX(event, 0); float y = AMotionEvent_getY(event, 0);
y = AMotionEvent_getY(event, 0);
pressed_up = ((-0.80f > y) && (x >= -1.00f));
pressed_down = ((0.80f < y) && (y <= 1.00f));
pressed_left = ((-0.80f > x) && (x >= -1.00f));
pressed_right = ((0.80f < x) && (x <= 1.00f));
#ifdef RARCH_INPUT_DEBUG #ifdef RARCH_INPUT_DEBUG
RARCH_LOG("AINPUT_EVENT_TYPE_MOTION, pad: %d, x: %f, y: %f.\n", i, x, y); RARCH_LOG("AINPUT_EVENT_TYPE_MOTION, pad: %d, x: %f, y: %f.\n", i, x, y);
#endif #endif
state[i].state &= ~(android_binds[RETRO_DEVICE_ID_JOYPAD_LEFT].r_keycode); state[i].state &= ~(android_binds[RETRO_DEVICE_ID_JOYPAD_LEFT].r_keycode);
state[i].state &= ~(android_binds[RETRO_DEVICE_ID_JOYPAD_RIGHT].r_keycode); state[i].state &= ~(android_binds[RETRO_DEVICE_ID_JOYPAD_RIGHT].r_keycode);
state[i].state &= ~(android_binds[RETRO_DEVICE_ID_JOYPAD_UP].r_keycode); state[i].state &= ~(android_binds[RETRO_DEVICE_ID_JOYPAD_UP].r_keycode);
state[i].state &= ~(android_binds[RETRO_DEVICE_ID_JOYPAD_DOWN].r_keycode); state[i].state &= ~(android_binds[RETRO_DEVICE_ID_JOYPAD_DOWN].r_keycode);
state[i].state |= pressed_left ? ANDROID_GAMEPAD_DPAD_LEFT : 0; state[i].state |= PRESSED_LEFT(x, y) ? ANDROID_GAMEPAD_DPAD_LEFT : 0;
state[i].state |= pressed_right ? ANDROID_GAMEPAD_DPAD_RIGHT : 0; state[i].state |= PRESSED_RIGHT(x, y) ? ANDROID_GAMEPAD_DPAD_RIGHT : 0;
state[i].state |= pressed_up ? ANDROID_GAMEPAD_DPAD_UP : 0; state[i].state |= PRESSED_UP(x, y) ? ANDROID_GAMEPAD_DPAD_UP : 0;
state[i].state |= pressed_down ? ANDROID_GAMEPAD_DPAD_DOWN : 0; state[i].state |= PRESSED_DOWN(x, y) ? ANDROID_GAMEPAD_DPAD_DOWN : 0;
break;
} }
if(action != AKEY_EVENT_NO_ACTION) if(action != AKEY_EVENT_NO_ACTION)