mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 17:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RGUI) add dpad-emulation configuration

Browse Source
This commit is contained in:
Toad King 2012-08-21 18:41:56 -04:00
parent 9c1725358b
commit 213823fd84
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
console/rarch_console_input.c
View File

@ -49,6 +49,12 @@ char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][32] = {
"RetroPad Button R3", /* RETRO_DEVICE_ID_JOYPAD_R3 */ "RetroPad Button R3", /* RETRO_DEVICE_ID_JOYPAD_R3 */
}; };
char rarch_dpad_emulation_name_lut[KEYBIND_DEFAULT][32] = {
"None", /* DPAD_EMULATION_NONE */
"Left Stick", /* DPAD_EMULATION_LSTICK */
"Right Stick", /* DPAD_EMULATION_RSTICK */
};
extern const struct platform_bind platform_keys[]; extern const struct platform_bind platform_keys[];
extern const unsigned int platform_keys_size; extern const unsigned int platform_keys_size;

4
console/rarch_console_input.h
View File

@ -31,7 +31,8 @@ enum
{ {
DPAD_EMULATION_NONE = 0, DPAD_EMULATION_NONE = 0,
DPAD_EMULATION_LSTICK, DPAD_EMULATION_LSTICK,
DPAD_EMULATION_RSTICK DPAD_EMULATION_RSTICK,
DPAD_EMULATION_LAST
}; };
enum enum
@ -48,6 +49,7 @@ enum
extern uint64_t rarch_default_keybind_lut[RARCH_FIRST_META_KEY]; extern uint64_t rarch_default_keybind_lut[RARCH_FIRST_META_KEY];
extern char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][32]; extern char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][32];
extern char rarch_dpad_emulation_name_lut[KEYBIND_DEFAULT][32];
const char *rarch_input_find_platform_key_label(uint64_t joykey); const char *rarch_input_find_platform_key_label(uint64_t joykey);

15
console/rgui/rgui.c
View File

@ -362,6 +362,9 @@ static void render_text(rgui_handle_t *rgui)
case RGUI_SETTINGS_BIND_DEVICE: case RGUI_SETTINGS_BIND_DEVICE:
snprintf(type_str, sizeof(type_str), "%s", rgui_device_labels[g_settings.input.device[port]]); snprintf(type_str, sizeof(type_str), "%s", rgui_device_labels[g_settings.input.device[port]]);
break; break;
case RGUI_SETTINGS_BIND_DPAD_EMULATION:
snprintf(type_str, sizeof(type_str), "%s", rarch_dpad_emulation_name_lut[g_settings.input.dpad_emulation[port]]);
break;
case RGUI_SETTINGS_BIND_UP: case RGUI_SETTINGS_BIND_UP:
case RGUI_SETTINGS_BIND_DOWN: case RGUI_SETTINGS_BIND_DOWN:
case RGUI_SETTINGS_BIND_LEFT: case RGUI_SETTINGS_BIND_LEFT:
@ -583,6 +586,17 @@ static void rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
rarch_input_set_default_keybinds(port); rarch_input_set_default_keybinds(port);
input_gx.set_analog_dpad_mapping(g_settings.input.device[port], g_settings.input.dpad_emulation[port], port); input_gx.set_analog_dpad_mapping(g_settings.input.device[port], g_settings.input.dpad_emulation[port], port);
break; break;
case RGUI_SETTINGS_BIND_DPAD_EMULATION:
g_settings.input.dpad_emulation[port] += DPAD_EMULATION_LAST;
if (action == RGUI_ACTION_START)
g_settings.input.dpad_emulation[port] = DPAD_EMULATION_LSTICK;
else if (action == RGUI_ACTION_LEFT)
g_settings.input.dpad_emulation[port]--;
else if (action == RGUI_ACTION_RIGHT)
g_settings.input.dpad_emulation[port]++;
g_settings.input.dpad_emulation[port] %= DPAD_EMULATION_LAST;
input_gx.set_analog_dpad_mapping(g_settings.input.device[port], g_settings.input.dpad_emulation[port], port);
break;
case RGUI_SETTINGS_BIND_UP: case RGUI_SETTINGS_BIND_UP:
case RGUI_SETTINGS_BIND_DOWN: case RGUI_SETTINGS_BIND_DOWN:
case RGUI_SETTINGS_BIND_LEFT: case RGUI_SETTINGS_BIND_LEFT:
@ -655,6 +669,7 @@ static void rgui_settings_controller_populate_entries(rgui_handle_t *rgui)
rgui_list_clear(rgui->folder_buf); rgui_list_clear(rgui->folder_buf);
RGUI_MENU_ITEM("Device", RGUI_SETTINGS_BIND_DEVICE); RGUI_MENU_ITEM("Device", RGUI_SETTINGS_BIND_DEVICE);
RGUI_MENU_ITEM("DPad Emulation", RGUI_SETTINGS_BIND_DPAD_EMULATION);
RGUI_MENU_ITEM("Up", RGUI_SETTINGS_BIND_UP); RGUI_MENU_ITEM("Up", RGUI_SETTINGS_BIND_UP);
RGUI_MENU_ITEM("Down", RGUI_SETTINGS_BIND_DOWN); RGUI_MENU_ITEM("Down", RGUI_SETTINGS_BIND_DOWN);
RGUI_MENU_ITEM("Left", RGUI_SETTINGS_BIND_LEFT); RGUI_MENU_ITEM("Left", RGUI_SETTINGS_BIND_LEFT);

1
console/rgui/rgui.h
View File

@ -57,6 +57,7 @@ typedef enum
RGUI_SETTINGS_RESTART_EMULATOR, RGUI_SETTINGS_RESTART_EMULATOR,
RGUI_SETTINGS_BIND_DEVICE, RGUI_SETTINGS_BIND_DEVICE,
RGUI_SETTINGS_BIND_DPAD_EMULATION,
RGUI_SETTINGS_BIND_UP, RGUI_SETTINGS_BIND_UP,
RGUI_SETTINGS_BIND_DOWN, RGUI_SETTINGS_BIND_DOWN,
RGUI_SETTINGS_BIND_LEFT, RGUI_SETTINGS_BIND_LEFT,