mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2887 from lakkatv/master

Browse Source 
(XMB) Animation polishing
This commit is contained in:
Twinaphex 2016-04-22 13:18:18 +02:00
commit 1e2917a78c
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/cbs/menu_cbs_get_value.c
View File

@ -658,6 +658,9 @@ static void menu_action_setting_disp_set_label_xmb_gradient(
case 6:
snprintf(s, len, "%s", "Undersea");
break;
case 7:
snprintf(s, len, "%s", "Volcanic Red");
break;
}
}

29
menu/drivers/xmb.c
View File

@ -281,6 +281,13 @@ float gradient_undersea[16] = {
};
float gradient_volcanic_red[16] = {
1.0, 0.0, 0.1, 1.00,
1.0, 0.1, 0.0, 1.00,
0.1, 0.0, 0.1, 1.00,
0.1, 0.0, 0.1, 1.00,
};
static const char *xmb_theme_ident(void)
{
settings_t *settings = config_get_ptr();
@ -338,6 +345,8 @@ static float *xmb_gradient_ident(void)
return &gradient_apple_green[0];
case 6:
return &gradient_undersea[0];
case 7:
return &gradient_volcanic_red[0];
case 0:
default:
break;
@ -760,7 +769,7 @@ static void xmb_selection_pointer_changed(
entry.duration = XMB_DELAY;
entry.target_value = ia;
entry.subject = &node->alpha;
entry.easing_enum = EASING_IN_OUT_QUAD;
entry.easing_enum = EASING_OUT_QUAD;
entry.tag = tag.id;
entry.cb = NULL;
@ -826,7 +835,7 @@ static void xmb_list_open_old(xmb_handle_t *xmb,
entry.duration = XMB_DELAY;
entry.target_value = ia;
entry.subject = &node->alpha;
entry.easing_enum = EASING_IN_OUT_QUAD;
entry.easing_enum = EASING_OUT_QUAD;
entry.tag = -1;
entry.cb = NULL;
@ -896,7 +905,7 @@ static void xmb_list_open_new(xmb_handle_t *xmb,
entry.duration = XMB_DELAY;
entry.target_value = ia;
entry.subject = &node->alpha;
entry.easing_enum = EASING_IN_OUT_QUAD;
entry.easing_enum = EASING_OUT_QUAD;
entry.tag = -1;
entry.cb = NULL;
@ -956,7 +965,7 @@ static void xmb_push_animations(xmb_node_t *node, float ia, float ix)
entry.duration = XMB_DELAY;
entry.target_value = ia;
entry.subject = &node->alpha;
entry.easing_enum = EASING_IN_OUT_QUAD;
entry.easing_enum = EASING_OUT_QUAD;
entry.tag = -1;
entry.cb = NULL;
@ -1117,7 +1126,7 @@ static void xmb_list_switch_horizontal_list(xmb_handle_t *xmb)
entry.duration = XMB_DELAY;
entry.target_value = ia;
entry.subject = &node->alpha;
entry.easing_enum = EASING_IN_OUT_QUAD;
entry.easing_enum = EASING_OUT_QUAD;
entry.tag = -1;
entry.cb = NULL;
@ -1150,7 +1159,7 @@ static void xmb_list_switch(xmb_handle_t *xmb)
entry.duration = XMB_DELAY;
entry.target_value = xmb->icon.spacing.horizontal * -(float)xmb->categories.selection_ptr;
entry.subject = &xmb->categories.x_pos;
entry.easing_enum = EASING_IN_OUT_QUAD;
entry.easing_enum = EASING_OUT_QUAD;
entry.tag = -1;
entry.cb = NULL;
@ -1195,7 +1204,7 @@ static void xmb_list_open_horizontal_list(xmb_handle_t *xmb)
entry.duration = XMB_DELAY;
entry.target_value = ia;
entry.subject = &node->alpha;
entry.easing_enum = EASING_IN_OUT_QUAD;
entry.easing_enum = EASING_OUT_QUAD;
entry.tag = -1;
entry.cb = NULL;
@ -1424,7 +1433,7 @@ static void xmb_list_open(xmb_handle_t *xmb)
entry.duration = XMB_DELAY;
entry.target_value = xmb->icon.size * -(xmb->depth*2-2);
entry.subject = &xmb->x;
entry.easing_enum = EASING_IN_OUT_QUAD;
entry.easing_enum = EASING_OUT_QUAD;
entry.tag = -1;
entry.cb = NULL;
@ -2952,10 +2961,10 @@ static void xmb_toggle(void *userdata, bool menu_on)
return;
}
entry.duration = XMB_DELAY;
entry.duration = XMB_DELAY * 2;
entry.target_value = 1.0f;
entry.subject = &xmb->alpha;
entry.easing_enum = EASING_IN_OUT_QUAD;
entry.easing_enum = EASING_OUT_QUAD;
entry.tag = -1;
entry.cb = NULL;

2
menu/menu_setting.c
View File

@ -5914,7 +5914,7 @@ static bool setting_append_list(
parent_group,
general_write_handler,
general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 6, 1, true, true);
menu_settings_list_current_add_range(list, list_info, 0, 7, 1, true, true);
}
CONFIG_BOOL(