CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-13 06:10:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(RARCH_CONSOLE) save input device selection

Browse Source 
(GX) set dpad_emulation correctly for device on init
This commit is contained in:
Toad King 2012-08-21 18:13:22 -04:00
parent 9a0d6a0c33
commit faf0b6f676
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console/rarch_console_config.c
View File

@ -71,6 +71,8 @@ void rarch_config_load(const char * conf_name, const char * libretro_dir_path, c
char cfg[64];
snprintf(cfg, sizeof(cfg), "input_dpad_emulation_p%u", i + 1);
CONFIG_GET_INT(input.dpad_emulation[i], cfg);
snprintf(cfg, sizeof(cfg), "input_device_p%u", i + 1);
CONFIG_GET_INT(input.device[i], cfg);
}
// g_console
@ -147,6 +149,8 @@ void rarch_config_save(const char * conf_name)
char cfg[64];
snprintf(cfg, sizeof(cfg), "input_dpad_emulation_p%u", i + 1);
config_set_int(conf, cfg, g_settings.input.dpad_emulation[i]);
snprintf(cfg, sizeof(cfg), "input_device_p%u", i + 1);
config_set_int(conf, cfg, g_settings.input.device[i]);
}
#ifdef RARCH_CONSOLE

22
gx/gx_input.c
View File

@ -244,12 +244,10 @@ static void *gx_input_initialize(void)
return (void*)-1;
}
#define STUB_DEVICE 0
static void gx_input_post_init(void)
{
for(unsigned i = 0; i < MAX_PADS; i++)
gx_input_set_analog_dpad_mapping(STUB_DEVICE, g_settings.input.dpad_emulation[i], i);
gx_input_set_analog_dpad_mapping(g_settings.input.device[i], g_settings.input.dpad_emulation[i], i);
}
#define gx_stick_x(x) ((s8)((sin((x).ang * M_PI / 180.0f)) * (x).mag * 128.0f))
@ -370,7 +368,7 @@ static void gx_input_poll(void *data)
if((down & WPAD_CLASSIC_BUTTON_HOME) && (down & WPAD_CLASSIC_BUTTON_ZL) && (down & WPAD_CLASSIC_BUTTON_ZR))
quit_classic = true;
//TODO: Hack, analog stick twitchiness needs to be properly fixed
//TODO: Hack, analog stick twitchiness needs to be properly fixed
if(gx->menu_render)
{
s8 x = gx_stick_x(exp.classic.ljs);
@ -396,14 +394,14 @@ static void gx_input_poll(void *data)
u8 rs_x = exp.classic.rjs.pos.x;
u8 rs_y = exp.classic.rjs.pos.y;
state |= (ls_x > 40) ? GX_CLASSIC_LSTICK_RIGHT : 0;
state |= (ls_x < 25) ? GX_CLASSIC_LSTICK_LEFT : 0;
state |= (ls_y > 45) ? GX_CLASSIC_LSTICK_UP : 0;
state |= (ls_y < 20) ? GX_CLASSIC_LSTICK_DOWN : 0;
state |= (rs_x > 40) ? GX_CLASSIC_RSTICK_RIGHT : 0;
state |= (rs_x < 25) ? GX_CLASSIC_RSTICK_LEFT: 0;
state |= (rs_y > 45) ? GX_CLASSIC_RSTICK_UP : 0;
state |= (rs_y < 20) ? GX_CLASSIC_RSTICK_DOWN : 0;
state |= (ls_x > 40) ? GX_CLASSIC_LSTICK_RIGHT : 0;
state |= (ls_x < 25) ? GX_CLASSIC_LSTICK_LEFT : 0;
state |= (ls_y > 45) ? GX_CLASSIC_LSTICK_UP : 0;
state |= (ls_y < 20) ? GX_CLASSIC_LSTICK_DOWN : 0;
state |= (rs_x > 40) ? GX_CLASSIC_RSTICK_RIGHT : 0;
state |= (rs_x < 25) ? GX_CLASSIC_RSTICK_LEFT: 0;
state |= (rs_y > 45) ? GX_CLASSIC_RSTICK_UP : 0;
state |= (rs_y < 20) ? GX_CLASSIC_RSTICK_DOWN : 0;
}
// do not return, fall through for wiimote d-pad
}