mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(gfx_animation.c) Cleanups; prevent useless tertiary operators where

Browse Source 
possible
This commit is contained in:
libretroadmin 2022-07-07 10:03:33 +02:00
parent 547c88259d
commit 19b2ad56b0
1 changed files with 59 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
gfx/gfx_animation.c
View File

@ -323,20 +323,17 @@ static size_t gfx_animation_ticker_generic(uint64_t idx,
const int phase_left_stop = 2; const int phase_left_stop = 2;
int ticker_period = (int)(2 * old_width + 4); int ticker_period = (int)(2 * old_width + 4);
int phase = idx % ticker_period; int phase = idx % ticker_period;
int phase_left_moving = (int)(phase_left_stop + old_width); int phase_left_moving = (int)(phase_left_stop + old_width);
int phase_right_stop = phase_left_moving + 2; int phase_right_stop = phase_left_moving + 2;
int left_offset = phase - phase_left_stop;
int right_offset = (int)(old_width - (phase - phase_right_stop));
if (phase < phase_left_stop) if (phase < phase_left_stop)
return 0; return 0;
else if (phase < phase_left_moving) else if (phase < phase_left_moving) /* left offset? */
return left_offset; return phase - phase_left_stop;
else if (phase < phase_right_stop) else if (phase < phase_right_stop)
return old_width; return old_width;
return right_offset; /* right offset */
return (int)(old_width - (phase - phase_right_stop));
} }
static void gfx_animation_ticker_loop(uint64_t idx, static void gfx_animation_ticker_loop(uint64_t idx,
@ -366,15 +363,18 @@ static void gfx_animation_ticker_loop(uint64_t idx,
/* String 1 */ /* String 1 */
int offset = (phase < (int)str_width) ? phase : 0; int offset = (phase < (int)str_width) ? phase : 0;
int width = (int)(str_width - phase); int width = (int)(str_width - phase);
width = (width < 0) ? 0 : width; if (width < 0)
width = (width > (int)max_width) ? (int)max_width : width; width = 0;
else if ((width > (int)max_width))
width = (int)max_width;
*offset1 = offset; *offset1 = offset;
*width1 = width; *width1 = width;
/* String 2 */ /* String 2 */
offset = (int)(phase - str_width); offset = (int)(phase - str_width);
offset = offset < 0 ? 0 : offset; if (offset < 0)
offset = 0;
width = (int)(max_width - *width1); width = (int)(max_width - *width1);
width = (width > (int)spacer_width) ? (int)spacer_width : width; width = (width > (int)spacer_width) ? (int)spacer_width : width;
width = width - offset; width = width - offset;
@ -384,7 +384,8 @@ static void gfx_animation_ticker_loop(uint64_t idx,
/* String 3 */ /* String 3 */
width = (int)(max_width - (*width1 + *width2)); width = (int)(max_width - (*width1 + *width2));
width = width < 0 ? 0 : width; if (width < 0)
width = 0;
/* Note: offset is always zero here so offset3 is /* Note: offset is always zero here so offset3 is
* unnecessary - but include it anyway to preserve * unnecessary - but include it anyway to preserve
@ -419,12 +420,8 @@ static void ticker_smooth_scan_string_fw(
unsigned *char_offset, unsigned *num_chars_to_copy, unsigned *char_offset, unsigned *num_chars_to_copy,
unsigned *x_offset) unsigned *x_offset)
{ {
unsigned chars_remaining = 0;
/* Initialise output variables to 'sane' values */ /* Initialise output variables to 'sane' values */
*char_offset = 0;
*num_chars_to_copy = 0; *num_chars_to_copy = 0;
*x_offset = 0;
/* Determine index of first character to copy */ /* Determine index of first character to copy */
if (scroll_offset > 0) if (scroll_offset > 0)
@ -432,12 +429,17 @@ static void ticker_smooth_scan_string_fw(
*char_offset = (scroll_offset / glyph_width) + 1; *char_offset = (scroll_offset / glyph_width) + 1;
*x_offset = glyph_width - (scroll_offset % glyph_width); *x_offset = glyph_width - (scroll_offset % glyph_width);
} }
else
{
*char_offset = 0;
*x_offset = 0;
}
/* Determine number of characters remaining in /* Determine number of characters remaining in
* string once offset has been subtracted */ * string once offset has been subtracted */
if (*char_offset < num_chars) if (*char_offset < num_chars)
chars_remaining = num_chars - *char_offset; {
unsigned chars_remaining = num_chars - *char_offset;
/* Determine number of characters to copy */ /* Determine number of characters to copy */
if ((chars_remaining > 0) && (field_width > *x_offset)) if ((chars_remaining > 0) && (field_width > *x_offset))
{ {
@ -445,6 +447,7 @@ static void ticker_smooth_scan_string_fw(
if (*num_chars_to_copy > chars_remaining) if (*num_chars_to_copy > chars_remaining)
*num_chars_to_copy = chars_remaining; *num_chars_to_copy = chars_remaining;
} }
}
} }
/* 'Fixed width' font version of gfx_animation_ticker_smooth_generic() */ /* 'Fixed width' font version of gfx_animation_ticker_smooth_generic() */
@ -453,21 +456,20 @@ static void gfx_animation_ticker_smooth_generic_fw(uint64_t idx,
unsigned glyph_width, unsigned field_width, unsigned glyph_width, unsigned field_width,
unsigned *char_offset, unsigned *num_chars_to_copy, unsigned *x_offset) unsigned *char_offset, unsigned *num_chars_to_copy, unsigned *x_offset)
{ {
unsigned scroll_offset = get_ticker_smooth_generic_scroll_offset(
idx, str_width, field_width);
/* Initialise output variables to 'sane' values */ /* Initialise output variables to 'sane' values */
*char_offset = 0; *char_offset = 0;
*num_chars_to_copy = 0; *num_chars_to_copy = 0;
*x_offset = 0; *x_offset = 0;
/* Sanity check */ /* Sanity check */
if (num_chars < 1) if (num_chars >= 1)
return; {
unsigned scroll_offset = get_ticker_smooth_generic_scroll_offset(
idx, str_width, field_width);
ticker_smooth_scan_string_fw( ticker_smooth_scan_string_fw(
num_chars, glyph_width, field_width, scroll_offset, num_chars, glyph_width, field_width, scroll_offset,
char_offset, num_chars_to_copy, x_offset); char_offset, num_chars_to_copy, x_offset);
}
} }
/* 'Fixed width' font version of gfx_animation_ticker_smooth_loop() */ /* 'Fixed width' font version of gfx_animation_ticker_smooth_loop() */
@ -647,9 +649,6 @@ static void gfx_animation_ticker_smooth_generic(uint64_t idx,
unsigned *char_offset, unsigned *num_chars_to_copy, unsigned *char_offset, unsigned *num_chars_to_copy,
unsigned *x_offset, unsigned *dst_str_width) unsigned *x_offset, unsigned *dst_str_width)
{ {
unsigned scroll_offset = get_ticker_smooth_generic_scroll_offset(
idx, str_width, field_width);
/* Initialise output variables to 'sane' values */ /* Initialise output variables to 'sane' values */
*char_offset = 0; *char_offset = 0;
*num_chars_to_copy = 0; *num_chars_to_copy = 0;
@ -658,12 +657,14 @@ static void gfx_animation_ticker_smooth_generic(uint64_t idx,
*dst_str_width = 0; *dst_str_width = 0;
/* Sanity check */ /* Sanity check */
if (num_chars < 1) if (num_chars >= 1)
return; {
unsigned scroll_offset = get_ticker_smooth_generic_scroll_offset(
idx, str_width, field_width);
ticker_smooth_scan_characters( ticker_smooth_scan_characters(
char_widths, num_chars, field_width, scroll_offset, char_widths, num_chars, field_width, scroll_offset,
char_offset, num_chars_to_copy, x_offset, dst_str_width, NULL); char_offset, num_chars_to_copy, x_offset, dst_str_width, NULL);
}
} }
static void gfx_animation_ticker_smooth_loop(uint64_t idx, static void gfx_animation_ticker_smooth_loop(uint64_t idx,
@ -834,8 +835,10 @@ static void set_line_smooth_fade_parameters(
* it's the other way around */ * it's the other way around */
float fade_out_alpha = ((float)scroll_ticks - ((float)line_phase * 2.0f)) / (float)scroll_ticks; float fade_out_alpha = ((float)scroll_ticks - ((float)line_phase * 2.0f)) / (float)scroll_ticks;
float fade_in_alpha = -1.0f * fade_out_alpha; float fade_in_alpha = -1.0f * fade_out_alpha;
fade_out_alpha = (fade_out_alpha < 0.0f) ? 0.0f : fade_out_alpha; if (fade_out_alpha < 0.0f)
fade_in_alpha = (fade_in_alpha < 0.0f) ? 0.0f : fade_in_alpha; fade_out_alpha = 0.0f;
if (fade_in_alpha < 0.0f)
fade_in_alpha = 0.0f;
*top_fade_line_offset = (line_offset > 0) ? line_offset - 1 : num_lines; *top_fade_line_offset = (line_offset > 0) ? line_offset - 1 : num_lines;
*top_fade_y_offset = y_offset - (float)line_height; *top_fade_y_offset = y_offset - (float)line_height;
@ -908,17 +911,22 @@ static void gfx_animation_line_ticker_smooth_generic(uint64_t idx,
line_phase = phase % scroll_ticks; line_phase = phase % scroll_ticks;
if (pause || (line_phase == 0)) if (pause)
{ {
/* Static display of max_display_lines /* Static display of max_display_lines
* (no animation) */ * (no animation) */
*num_display_lines = max_display_lines; *num_display_lines = max_display_lines;
*y_offset = 0.0f; *y_offset = 0.0f;
*fade_active = false; *fade_active = false;
if (pause)
*line_offset = scroll_up ? 0 : excess_lines; *line_offset = scroll_up ? 0 : excess_lines;
else }
else if (line_phase == 0)
{
/* Static display of max_display_lines
* (no animation) */
*num_display_lines = max_display_lines;
*y_offset = 0.0f;
*fade_active = false;
*line_offset = scroll_up ? (phase / scroll_ticks) : (excess_lines - (phase / scroll_ticks)); *line_offset = scroll_up ? (phase / scroll_ticks) : (excess_lines - (phase / scroll_ticks));
} }
else else