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

Simplify input_push_analog_dpad

Browse Source
This commit is contained in:
twinaphex 2016-12-04 21:30:50 +01:00
parent 185925cf3a
commit 85aa88f665
4 changed files with 60 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/drivers_tracker/video_state_python.c
View File

@ -389,10 +389,16 @@ float py_state_get(py_state_t *handle, const char *id,
{
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
input_push_analog_dpad(general_binds,
settings->input.analog_dpad_mode[i]);
input_push_analog_dpad(auto_binds,
settings->input.analog_dpad_mode[i]);
enum analog_dpad_mode dpad_mode = settings->input.analog_dpad_mode[i];
if (dpad_mode == ANALOG_DPAD_NONE)
continue;
input_push_analog_dpad_pre(general_binds);
input_push_analog_dpad_pre(auto_binds);
input_push_analog_dpad(general_binds, dpad_mode);
input_push_analog_dpad(auto_binds, dpad_mode);
}
ret = PyObject_CallMethod(handle->inst, (char*)id, (char*)"I", frame_count);

74
input/input_driver.c
View File

@ -262,48 +262,34 @@ float input_sensor_get_input(unsigned port, unsigned id)
*
* Push analog to D-Pad mappings to binds.
**/
void input_push_analog_dpad(struct retro_keybind *binds, unsigned mode)
void input_push_analog_dpad(struct retro_keybind *binds, enum analog_dpad_mode mode)
{
unsigned i, j = 0;
bool inherit_joyaxis = false;
unsigned i;
unsigned x_plus = RARCH_ANALOG_RIGHT_X_PLUS;
unsigned y_plus = RARCH_ANALOG_RIGHT_Y_PLUS;
unsigned x_minus = RARCH_ANALOG_RIGHT_X_MINUS;
unsigned y_minus = RARCH_ANALOG_RIGHT_Y_MINUS;
for (i = RETRO_DEVICE_ID_JOYPAD_UP; i <= RETRO_DEVICE_ID_JOYPAD_RIGHT; i++)
binds[i].orig_joyaxis = binds[i].joyaxis;
switch (mode)
if (mode == ANALOG_DPAD_LSTICK)
{
case ANALOG_DPAD_LSTICK:
/* check if analog left is defined. *
* if plus and minus are equal abort. */
if (!((binds[RARCH_ANALOG_LEFT_X_PLUS].joyaxis ==
binds[RARCH_ANALOG_LEFT_X_MINUS].joyaxis) ||
(binds[RARCH_ANALOG_LEFT_Y_PLUS].joyaxis ==
binds[RARCH_ANALOG_LEFT_Y_MINUS].joyaxis)))
{
j = RARCH_ANALOG_LEFT_X_PLUS + 3;
inherit_joyaxis = true;
}
break;
case ANALOG_DPAD_RSTICK:
/* check if analog right is defined. *
* if plus and minus are equal abort. */
if (!((binds[RARCH_ANALOG_RIGHT_X_PLUS].joyaxis ==
binds[RARCH_ANALOG_RIGHT_X_MINUS].joyaxis) ||
(binds[RARCH_ANALOG_RIGHT_Y_PLUS].joyaxis ==
binds[RARCH_ANALOG_RIGHT_Y_MINUS].joyaxis)))
{
j = RARCH_ANALOG_RIGHT_X_PLUS + 3;
inherit_joyaxis = true;
}
break;
x_plus = RARCH_ANALOG_LEFT_X_PLUS;
y_plus = RARCH_ANALOG_LEFT_Y_PLUS;
x_minus = RARCH_ANALOG_LEFT_X_MINUS;
y_minus = RARCH_ANALOG_LEFT_Y_MINUS;
}
if (!inherit_joyaxis)
return;
if (!(
( binds[x_plus].joyaxis == binds[x_minus].joyaxis) ||
( binds[y_plus].joyaxis == binds[y_minus].joyaxis)
)
)
{
unsigned j = x_plus + 3;
/* Inherit joyaxis from analogs. */
for (i = RETRO_DEVICE_ID_JOYPAD_UP; i <= RETRO_DEVICE_ID_JOYPAD_RIGHT; i++)
binds[i].joyaxis = binds[j--].joyaxis;
/* Inherit joyaxis from analogs. */
for (i = RETRO_DEVICE_ID_JOYPAD_UP; i <= RETRO_DEVICE_ID_JOYPAD_RIGHT; i++)
binds[i].joyaxis = binds[j--].joyaxis;
}
}
/**
@ -562,10 +548,16 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
{
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
input_push_analog_dpad(general_binds,
settings->input.analog_dpad_mode[i]);
input_push_analog_dpad(auto_binds,
settings->input.analog_dpad_mode[i]);
enum analog_dpad_mode dpad_mode = settings->input.analog_dpad_mode[i];
if (dpad_mode == ANALOG_DPAD_NONE)
continue;
input_push_analog_dpad_pre(general_binds);
input_push_analog_dpad_pre(auto_binds);
input_push_analog_dpad(general_binds, dpad_mode);
input_push_analog_dpad(auto_binds, dpad_mode);
}
if (!input_driver_is_libretro_input_blocked())
@ -780,6 +772,8 @@ uint64_t input_menu_keys_pressed(void)
for (i = 0; i < settings->input.max_users; i++)
{
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
input_push_analog_dpad_pre(auto_binds);
input_push_analog_dpad(auto_binds, ANALOG_DPAD_LSTICK);
}

9
input/input_driver.h
View File

@ -179,6 +179,13 @@ bool input_translate_coord_viewport(int mouse_x, int mouse_y,
int16_t *res_x, int16_t *res_y, int16_t *res_screen_x,
int16_t *res_screen_y);
#define input_push_analog_dpad_pre(binds) \
{ \
unsigned k; \
for (k = RETRO_DEVICE_ID_JOYPAD_UP; k <= RETRO_DEVICE_ID_JOYPAD_RIGHT; k++) \
(binds)[k].orig_joyaxis = (binds)[k].joyaxis; \
}
/**
* input_push_analog_dpad:
* @binds : Binds to modify.
@ -189,7 +196,7 @@ bool input_translate_coord_viewport(int mouse_x, int mouse_y,
*
* Push analog to D-Pad mappings to binds.
**/
void input_push_analog_dpad(struct retro_keybind *binds, unsigned mode);
void input_push_analog_dpad(struct retro_keybind *binds, enum analog_dpad_mode mode);
/**
* input_pop_analog_dpad:

13
runloop.c
View File

@ -1242,13 +1242,16 @@ int runloop_iterate(unsigned *sleep_ms)
{
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
if (!settings->input.analog_dpad_mode[i])
enum analog_dpad_mode dpad_mode = settings->input.analog_dpad_mode[i];
if (dpad_mode == ANALOG_DPAD_NONE)
continue;
input_push_analog_dpad(general_binds,
settings->input.analog_dpad_mode[i]);
input_push_analog_dpad(auto_binds,
settings->input.analog_dpad_mode[i]);
input_push_analog_dpad_pre(general_binds);
input_push_analog_dpad_pre(auto_binds);
input_push_analog_dpad(general_binds, dpad_mode);
input_push_analog_dpad(auto_binds, dpad_mode);
}
if ((settings->video.frame_delay > 0) &&