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

Merge branch 'master' of github.com:Themaister/RetroArch

This commit is contained in:
Themaister 2013-01-18 19:23:12 +01:00
parent 76a7b5aa60 7cfc60f374
commit 2443a761fc
5 changed files with 143 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
frontend/menu/rgui.c
View File

@ -30,12 +30,6 @@
#define TERM_WIDTH (((RGUI_WIDTH - TERM_START_X - 15) / (FONT_WIDTH_STRIDE))) #define TERM_WIDTH (((RGUI_WIDTH - TERM_START_X - 15) / (FONT_WIDTH_STRIDE)))
#define TERM_HEIGHT (((RGUI_HEIGHT - TERM_START_Y - 15) / (FONT_HEIGHT_STRIDE)) - 1) #define TERM_HEIGHT (((RGUI_HEIGHT - TERM_START_Y - 15) / (FONT_HEIGHT_STRIDE)) - 1)
#ifdef HAVE_HDD_CACHE_PARTITION
#define LAST_ZIP_EXTRACT ZIP_EXTRACT_TO_CACHE_DIR
#else
#define LAST_ZIP_EXTRACT ZIP_EXTRACT_TO_CURRENT_DIR_AND_LOAD_FIRST_FILE
#endif
#ifdef GEKKO #ifdef GEKKO
enum enum
{ {
@ -419,6 +413,12 @@ static void render_text(rgui_handle_t *rgui)
snprintf(type_str, sizeof(type_str), "(DEV)"); snprintf(type_str, sizeof(type_str), "(DEV)");
w = 5; w = 5;
break; break;
case RGUI_SETTINGS_REWIND_ENABLE:
snprintf(type_str, sizeof(type_str), g_settings.rewind_enable ? "ON" : "OFF");
break;
case RGUI_SETTINGS_REWIND_GRANULARITY:
snprintf(type_str, sizeof(type_str), "%d", g_settings.rewind_granularity);
break;
case RGUI_SETTINGS_SAVESTATE_SAVE: case RGUI_SETTINGS_SAVESTATE_SAVE:
case RGUI_SETTINGS_SAVESTATE_LOAD: case RGUI_SETTINGS_SAVESTATE_LOAD:
snprintf(type_str, sizeof(type_str), "%d", g_extern.state_slot); snprintf(type_str, sizeof(type_str), "%d", g_extern.state_slot);
@ -569,6 +569,28 @@ static int rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
switch (setting) switch (setting)
{ {
case RGUI_SETTINGS_REWIND_ENABLE:
if (action == RGUI_ACTION_OK || action == RGUI_ACTION_LEFT || action == RGUI_ACTION_RIGHT)
{
rmenu_settings_set(S_REWIND);
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
rmenu_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
}
else if (action == RGUI_ACTION_START)
g_settings.rewind_enable = false;
break;
case RGUI_SETTINGS_REWIND_GRANULARITY:
if (action == RGUI_ACTION_OK || action == RGUI_ACTION_RIGHT)
g_settings.rewind_granularity++;
else if (action == RGUI_ACTION_LEFT)
{
if (g_settings.rewind_granularity > 1)
g_settings.rewind_granularity--;
}
else if (action == RGUI_ACTION_START)
g_settings.rewind_granularity = 1;
break;
case RGUI_SETTINGS_SAVESTATE_SAVE: case RGUI_SETTINGS_SAVESTATE_SAVE:
case RGUI_SETTINGS_SAVESTATE_LOAD: case RGUI_SETTINGS_SAVESTATE_LOAD:
if (action == RGUI_ACTION_OK) if (action == RGUI_ACTION_OK)
@ -843,6 +865,8 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui)
{ {
rgui_list_clear(rgui->folder_buf); rgui_list_clear(rgui->folder_buf);
RGUI_MENU_ITEM("Rewind", RGUI_SETTINGS_REWIND_ENABLE);
RGUI_MENU_ITEM("Rewind granularity", RGUI_SETTINGS_REWIND_GRANULARITY);
if (g_extern.main_is_init) if (g_extern.main_is_init)
{ {
RGUI_MENU_ITEM("Save State", RGUI_SETTINGS_SAVESTATE_SAVE); RGUI_MENU_ITEM("Save State", RGUI_SETTINGS_SAVESTATE_SAVE);

2
frontend/menu/rgui.h
View File

@ -33,6 +33,8 @@ typedef enum
RGUI_SETTINGS, RGUI_SETTINGS,
// settings options are done here too // settings options are done here too
RGUI_SETTINGS_REWIND_ENABLE,
RGUI_SETTINGS_REWIND_GRANULARITY,
RGUI_SETTINGS_SAVESTATE_SAVE, RGUI_SETTINGS_SAVESTATE_SAVE,
RGUI_SETTINGS_SAVESTATE_LOAD, RGUI_SETTINGS_SAVESTATE_LOAD,
RGUI_SETTINGS_SCREENSHOT, RGUI_SETTINGS_SCREENSHOT,

8
frontend/menu/rmenu_gx.c
View File

@ -23,10 +23,10 @@ uint16_t menu_framebuf[400 * 240];
static const struct retro_keybind _rmenu_nav_binds[] = { static const struct retro_keybind _rmenu_nav_binds[] = {
#ifdef HW_RVL #ifdef HW_RVL
{ 0, 0, NULL, 0, GX_GC_UP | GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_CLASSIC_UP | GX_WIIMOTE_UP | GX_NUNCHUK_UP, 0 }, { 0, 0, NULL, 0, GX_GC_UP | GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_CLASSIC_UP | GX_CLASSIC_LSTICK_UP | GX_CLASSIC_RSTICK_UP | GX_WIIMOTE_UP | GX_NUNCHUK_UP, 0 },
{ 0, 0, NULL, 0, GX_GC_DOWN | GX_GC_LSTICK_DOWN | GX_GC_RSTICK_DOWN | GX_CLASSIC_DOWN | GX_WIIMOTE_DOWN | GX_NUNCHUK_DOWN, 0 }, { 0, 0, NULL, 0, GX_GC_DOWN | GX_GC_LSTICK_DOWN | GX_GC_RSTICK_DOWN | GX_CLASSIC_DOWN | GX_CLASSIC_LSTICK_DOWN | GX_CLASSIC_RSTICK_DOWN | GX_WIIMOTE_DOWN | GX_NUNCHUK_DOWN, 0 },
{ 0, 0, NULL, 0, GX_GC_LEFT | GX_GC_LSTICK_LEFT | GX_GC_RSTICK_LEFT | GX_CLASSIC_LEFT | GX_WIIMOTE_LEFT | GX_NUNCHUK_LEFT, 0 }, { 0, 0, NULL, 0, GX_GC_LEFT | GX_GC_LSTICK_LEFT | GX_GC_RSTICK_LEFT | GX_CLASSIC_LEFT | GX_CLASSIC_LSTICK_LEFT | GX_CLASSIC_RSTICK_LEFT | GX_WIIMOTE_LEFT | GX_NUNCHUK_LEFT, 0 },
{ 0, 0, NULL, 0, GX_GC_RIGHT | GX_GC_LSTICK_RIGHT | GX_GC_RSTICK_RIGHT | GX_CLASSIC_RIGHT | GX_WIIMOTE_RIGHT | GX_NUNCHUK_RIGHT, 0 }, { 0, 0, NULL, 0, GX_GC_RIGHT | GX_GC_LSTICK_RIGHT | GX_GC_RSTICK_RIGHT | GX_CLASSIC_RIGHT | GX_CLASSIC_LSTICK_RIGHT | GX_CLASSIC_RSTICK_RIGHT | GX_WIIMOTE_RIGHT | GX_NUNCHUK_RIGHT, 0 },
{ 0, 0, NULL, 0, GX_GC_A | GX_CLASSIC_A | GX_WIIMOTE_A | GX_WIIMOTE_2, 0 }, { 0, 0, NULL, 0, GX_GC_A | GX_CLASSIC_A | GX_WIIMOTE_A | GX_WIIMOTE_2, 0 },
{ 0, 0, NULL, 0, GX_GC_B | GX_CLASSIC_B | GX_WIIMOTE_B | GX_WIIMOTE_1, 0 }, { 0, 0, NULL, 0, GX_GC_B | GX_CLASSIC_B | GX_WIIMOTE_B | GX_WIIMOTE_1, 0 },
{ 0, 0, NULL, 0, GX_GC_START | GX_CLASSIC_PLUS | GX_WIIMOTE_PLUS, 0 }, { 0, 0, NULL, 0, GX_GC_START | GX_CLASSIC_PLUS | GX_WIIMOTE_PLUS, 0 },

123
gx/gx_input.c
View File

@ -263,6 +263,32 @@ static void gx_input_post_init(void)
#define gx_stick_x(x) ((s8)((sin((x).ang * M_PI / 180.0f)) * (x).mag * 128.0f)) #define gx_stick_x(x) ((s8)((sin((x).ang * M_PI / 180.0f)) * (x).mag * 128.0f))
#define gx_stick_y(x) ((s8)((cos((x).ang * M_PI / 180.0f)) * (x).mag * 128.0f)) #define gx_stick_y(x) ((s8)((cos((x).ang * M_PI / 180.0f)) * (x).mag * 128.0f))
static s8 WPADCLASSIC_StickX(float mag, float ang)
{
/* calculate X value (angle needs to be converted into radians */
if (mag > 1.0f)
mag = 1.0f;
else if (mag < -1.0f)
mag = -1.0f;
double val = mag * cos(M_PI * ang / 180.0f);
return (s8)(val * 128.0f);
}
static s8 WPADCLASSIC_StickY(float mag, float ang)
{
/* calculate X value (angle needs to be converted into radians */
if (mag > 1.0f)
mag = 1.0f;
else if (mag < -1.0f)
mag = -1.0f;
double val = mag * sin(M_PI * ang / 180.0f);
return (s8)(val * 128.0f);
}
static void gx_input_poll(void *data) static void gx_input_poll(void *data)
{ {
(void)data; (void)data;
@ -332,19 +358,27 @@ static void gx_input_poll(void *data)
&& (down & WPAD_CLASSIC_BUTTON_ZR)) && (down & WPAD_CLASSIC_BUTTON_ZR))
*state_cur |= GX_QUIT_KEY; *state_cur |= GX_QUIT_KEY;
u8 ls_x = exp->classic.ljs.pos.x; s8 ls_x = WPADCLASSIC_StickX(exp->classic.ljs.mag, exp->classic.ljs.ang);
u8 ls_y = exp->classic.ljs.pos.y; s8 ls_y = WPADCLASSIC_StickY(exp->classic.ljs.mag, exp->classic.ljs.ang);
u8 rs_x = exp->classic.rjs.pos.x; s8 rs_x = WPADCLASSIC_StickX(exp->classic.rjs.mag, exp->classic.rjs.ang);
u8 rs_y = exp->classic.rjs.pos.y; s8 rs_y = WPADCLASSIC_StickY(exp->classic.rjs.mag, exp->classic.rjs.ang);
*state_cur |= (ls_x > 40) ? GX_CLASSIC_LSTICK_RIGHT : 0; #if 0
*state_cur |= (ls_x < 25) ? GX_CLASSIC_LSTICK_LEFT : 0; char str[128];
*state_cur |= (ls_y > 45) ? GX_CLASSIC_LSTICK_UP : 0; snprintf(str, sizeof(str), "ls x: %d, ls y: %d, rs x: %d, rs y: %d", ls_x, ls_y, rs_x, rs_y);
*state_cur |= (ls_y < 20) ? GX_CLASSIC_LSTICK_DOWN : 0; msg_queue_clear(g_extern.msg_queue);
*state_cur |= (rs_x > 40) ? GX_CLASSIC_RSTICK_RIGHT : 0; msg_queue_push(g_extern.msg_queue, str, 1, 48);
*state_cur |= (rs_x < 25) ? GX_CLASSIC_RSTICK_LEFT: 0; #endif
*state_cur |= (rs_y > 45) ? GX_CLASSIC_RSTICK_UP : 0;
*state_cur |= (rs_y < 20) ? GX_CLASSIC_RSTICK_DOWN : 0; *state_cur |= (ls_x < -40) ? GX_CLASSIC_LSTICK_RIGHT : 0;
*state_cur |= (ls_x > 40) ? GX_CLASSIC_LSTICK_LEFT : 0;
*state_cur |= (ls_y < -40) ? GX_CLASSIC_LSTICK_UP : 0;
*state_cur |= (ls_y > 40) ? GX_CLASSIC_LSTICK_DOWN : 0;
*state_cur |= (rs_x < -40) ? GX_CLASSIC_RSTICK_RIGHT : 0;
*state_cur |= (rs_x > 40) ? GX_CLASSIC_RSTICK_LEFT: 0;
*state_cur |= (rs_y < -40) ? GX_CLASSIC_RSTICK_UP : 0;
*state_cur |= (rs_y > 40) ? GX_CLASSIC_RSTICK_DOWN : 0;
} }
else if (type == WPAD_EXP_NUNCHUK) else if (type == WPAD_EXP_NUNCHUK)
{ {
@ -410,30 +444,81 @@ static void gx_input_poll(void *data)
} }
} }
uint64_t *state_p1 = &pad_state[0];
uint64_t *lifecycle_state = &g_extern.lifecycle_state; uint64_t *lifecycle_state = &g_extern.lifecycle_state;
uint64_t *pad_p1 = &pad_state[0];
*lifecycle_state &= ~((1ULL << RARCH_FAST_FORWARD_HOLD_KEY) | (1ULL << RARCH_LOAD_STATE_KEY) | (1ULL << RARCH_SAVE_STATE_KEY) | (1ULL << RARCH_STATE_SLOT_PLUS) | (1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_REWIND) *lifecycle_state &= ~(
| (1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_RMENU_TOGGLE) | (1ULL << RARCH_RMENU_QUICKMENU_TOGGLE)); (1ULL << RARCH_FAST_FORWARD_HOLD_KEY) |
(1ULL << RARCH_LOAD_STATE_KEY) |
(1ULL << RARCH_SAVE_STATE_KEY) |
(1ULL << RARCH_STATE_SLOT_PLUS) |
(1ULL << RARCH_STATE_SLOT_MINUS) |
(1ULL << RARCH_REWIND) |
(1ULL << RARCH_QUIT_KEY) |
(1ULL << RARCH_RMENU_TOGGLE) |
(1ULL << RARCH_RMENU_QUICKMENU_TOGGLE));
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_DOWN) && !(*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_DOWN) && !(*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_FAST_FORWARD_HOLD_KEY);
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_UP) && (*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_UP) && (*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_LOAD_STATE_KEY);
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_DOWN) && (*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_DOWN) && (*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_SAVE_STATE_KEY);
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_RIGHT) && (*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_RIGHT) && (*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_STATE_SLOT_PLUS);
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_LEFT) && (*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_LEFT) && (*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_STATE_SLOT_MINUS);
if (
#ifdef HW_RVL
((*state_p1 & GX_CLASSIC_RSTICK_UP) && !(*state_p1 & GX_CLASSIC_ZR_TRIGGER)) ||
#endif
((*state_p1 & GX_GC_RSTICK_UP) && !(*state_p1 & GX_GC_Z_TRIGGER))
)
*lifecycle_state |= (1ULL << RARCH_REWIND);
if (g_menu) if (g_menu)
{ {
*pad_p1 |= GX_WIIMOTE_HOME; *state_p1 |= GX_WIIMOTE_HOME;
g_menu = false; g_menu = false;
} }
if (g_quit) if (g_quit)
{ {
*pad_p1 |= GX_QUIT_KEY; *state_p1 |= GX_QUIT_KEY;
g_quit = false; g_quit = false;
} }
if (!(g_extern.frame_count < g_extern.delay_timer[0])) if (!(g_extern.frame_count < g_extern.delay_timer[0]))
{ {
if (*pad_p1 & GX_QUIT_KEY) if (*state_p1 & GX_QUIT_KEY)
*lifecycle_state |= (1ULL << RARCH_QUIT_KEY); *lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
if (*pad_p1 & (GX_WIIMOTE_HOME if (*state_p1 & (GX_WIIMOTE_HOME
#ifdef HW_RVL #ifdef HW_RVL
| GX_CLASSIC_HOME | GX_CLASSIC_HOME
#endif #endif

6
retroarch.c
View File

@ -2699,12 +2699,12 @@ int rarch_main_init(int argc, char *argv[])
g_extern.use_sram = true; g_extern.use_sram = true;
bool allow_cheats = true; bool allow_cheats = true;
fill_pathnames();
set_savestate_auto_index();
if (!init_rom_file(g_extern.game_type)) if (!init_rom_file(g_extern.game_type))
goto error; goto error;
fill_pathnames();
set_savestate_auto_index();
init_system_av_info(); init_system_av_info();
if (!g_extern.sram_load_disable) if (!g_extern.sram_load_disable)