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

(XMB) Rename variables

Browse Source
This commit is contained in:
Jean-André Santoni 2016-04-22 17:11:56 +07:00
parent f8f8650349
commit dad5215d93
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
menu/drivers/xmb.c
View File

@ -1875,8 +1875,8 @@ static void xmb_draw_bg(
float alpha, float alpha,
bool force_transparency, bool force_transparency,
uintptr_t texture_id, uintptr_t texture_id,
float *coord_color, float *coord_black,
float *coord_color2) float *coord_white)
{ {
menu_display_ctx_draw_t draw; menu_display_ctx_draw_t draw;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -1884,7 +1884,7 @@ static void xmb_draw_bg(
draw.texture = texture_id; draw.texture = texture_id;
draw.width = width; draw.width = width;
draw.height = height; draw.height = height;
draw.color = &coord_color[0]; draw.color = &coord_black[0];
draw.handle_alpha = alpha; draw.handle_alpha = alpha;
draw.force_transparency = force_transparency; draw.force_transparency = force_transparency;
draw.vertex = NULL; draw.vertex = NULL;
@ -1898,7 +1898,7 @@ static void xmb_draw_bg(
|| rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL) || rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)
) )
&& !draw.force_transparency && draw.texture) && !draw.force_transparency && draw.texture)
draw.color = &coord_color2[0]; draw.color = &coord_white[0];
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL); menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL);
@ -1907,7 +1907,7 @@ static void xmb_draw_bg(
if (settings->menu.xmb_ribbon_enable) if (settings->menu.xmb_ribbon_enable)
{ {
draw.color = xmb_gradient_ident(); draw.color = xmb_gradient_ident();
menu_display_set_alpha(draw.color, coord_color[3]); menu_display_set_alpha(draw.color, coord_black[3]);
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_GRADIENT, &draw); menu_display_ctl(MENU_DISPLAY_CTL_DRAW_GRADIENT, &draw);
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_RIBBON, &draw); menu_display_ctl(MENU_DISPLAY_CTL_DRAW_RIBBON, &draw);
} }
@ -1964,7 +1964,7 @@ static void xmb_frame(void *data)
math_matrix_4x4 mymat; math_matrix_4x4 mymat;
unsigned i, width, height; unsigned i, width, height;
char msg[PATH_MAX_LENGTH], title_msg[256]; char msg[PATH_MAX_LENGTH], title_msg[256];
float item_color[16], coord_color[16], coord_color2[16]; float item_color[16], coord_black[16], coord_white[16];
menu_display_ctx_rotate_draw_t rotate_draw; menu_display_ctx_rotate_draw_t rotate_draw;
bool display_kb = false; bool display_kb = false;
bool render_background = false; bool render_background = false;
@ -1987,15 +1987,15 @@ static void xmb_frame(void *data)
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
coord_color[i] = 0; coord_black[i] = 0;
coord_color2[i] = 1.0f; coord_white[i] = 1.0f;
item_color[i] = 1.0f; item_color[i] = 1.0f;
} }
menu_display_set_alpha(coord_color, menu_display_set_alpha(coord_black,
((float)settings->menu.xmb_alpha_factor/100 > xmb->alpha) ? ((float)settings->menu.xmb_alpha_factor/100 > xmb->alpha) ?
xmb->alpha : (float)settings->menu.xmb_alpha_factor/100); xmb->alpha : (float)settings->menu.xmb_alpha_factor/100);
menu_display_set_alpha(coord_color2, xmb->alpha); menu_display_set_alpha(coord_white, xmb->alpha);
xmb_draw_bg( xmb_draw_bg(
xmb, xmb,
@ -2004,8 +2004,8 @@ static void xmb_frame(void *data)
xmb->alpha, xmb->alpha,
false, false,
xmb->textures.bg, xmb->textures.bg,
coord_color, coord_black,
coord_color2); coord_white);
/* Title text */ /* Title text */
xmb_draw_text(xmb, xmb_draw_text(xmb,
@ -2029,12 +2029,12 @@ static void xmb_frame(void *data)
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL); menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL);
if (strcmp(xmb_thumbnails_ident(), "OFF") && xmb->thumbnail) if (strcmp(xmb_thumbnails_ident(), "OFF") && xmb->thumbnail)
xmb_draw_thumbnail(xmb, &coord_color2[0], width, height); xmb_draw_thumbnail(xmb, &coord_white[0], width, height);
/* Clock image */ /* Clock image */
menu_display_set_alpha(coord_color2, menu_display_set_alpha(coord_white,
1.00f > xmb->alpha ? xmb->alpha : 1.00f); 1.00f > xmb->alpha ? xmb->alpha : 1.00f);
if (settings->menu.timedate_enable && coord_color2[3] != 0) if (settings->menu.timedate_enable && coord_white[3] != 0)
xmb_draw_icon( xmb_draw_icon(
xmb->icon.size, xmb->icon.size,
&mymat, &mymat,
@ -2045,7 +2045,7 @@ static void xmb_frame(void *data)
1, 1,
0, 0,
1, 1,
&coord_color2[0]); &coord_white[0]);
if (settings->menu.timedate_enable) if (settings->menu.timedate_enable)
{ {
@ -2065,10 +2065,10 @@ static void xmb_frame(void *data)
} }
/* Arrow image */ /* Arrow image */
menu_display_set_alpha(coord_color2, menu_display_set_alpha(coord_white,
xmb->textures.arrow.alpha > xmb->alpha xmb->textures.arrow.alpha > xmb->alpha
? xmb->alpha : xmb->textures.arrow.alpha); ? xmb->alpha : xmb->textures.arrow.alpha);
if (coord_color2[3] != 0) if (coord_white[3] != 0)
xmb_draw_icon( xmb_draw_icon(
xmb->icon.size, xmb->icon.size,
&mymat, &mymat,
@ -2082,7 +2082,7 @@ static void xmb_frame(void *data)
height, height,
xmb->textures.arrow.alpha, xmb->textures.arrow.alpha,
0, 0,
1, &coord_color2[0]); 1, &coord_white[0]);
menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL); menu_display_ctl(MENU_DISPLAY_CTL_BLEND_BEGIN, NULL);
@ -2195,10 +2195,10 @@ static void xmb_frame(void *data)
} }
/* Cursor image */ /* Cursor image */
menu_display_set_alpha(coord_color2, menu_display_set_alpha(coord_white,
1.00f > xmb->alpha ? xmb->alpha : 1.00f); 1.00f > xmb->alpha ? xmb->alpha : 1.00f);
menu_display_draw_cursor( menu_display_draw_cursor(
&coord_color2[0], &coord_white[0],
xmb->cursor.size, xmb->cursor.size,
xmb->textures.list[XMB_TEXTURE_POINTER], xmb->textures.list[XMB_TEXTURE_POINTER],
menu_input_mouse_state(MENU_MOUSE_X_AXIS), menu_input_mouse_state(MENU_MOUSE_X_AXIS),