From 0f6c3564dc3288a2ec498746d1af0772868f6305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Fri, 22 Apr 2016 18:10:20 +0700 Subject: [PATCH 1/3] (XMB) Use an easing function closer to the one used in PS3 --- menu/drivers/xmb.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index faad73fa71..e1566d1238 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -760,7 +760,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 +826,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 +896,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 +956,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 +1117,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 +1150,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 +1195,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 +1424,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; @@ -2955,7 +2955,7 @@ static void xmb_toggle(void *userdata, bool menu_on) entry.duration = XMB_DELAY; 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; From 339a0cdef419a807f6663d30da7cb10457e5402b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Fri, 22 Apr 2016 18:11:39 +0700 Subject: [PATCH 2/3] (XMB) Increase the delay for xmb_toggle to make the animation more noticeable --- menu/drivers/xmb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index e1566d1238..0f68cfaed3 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2952,7 +2952,7 @@ 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_OUT_QUAD; From 9cd0d46476c16bc168f134b33599f6af95883b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Fri, 22 Apr 2016 18:16:31 +0700 Subject: [PATCH 3/3] (XMB) Add back the red gradient --- menu/cbs/menu_cbs_get_value.c | 3 +++ menu/drivers/xmb.c | 9 +++++++++ menu/menu_setting.c | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index e1e7546595..dd42eeb6a9 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -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; } } diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 0f68cfaed3..e713ac4c64 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -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; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 7e6c74ea75..dd20b376cc 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -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(