mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(gfx_animation.c) Small cleanups

Browse Source
This commit is contained in:
libretroadmin 2024-07-24 09:25:59 +02:00
parent 6b8025fdca
commit ac85405598
1 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
gfx/gfx_animation.c
View File

@ -396,20 +396,12 @@ 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)
{ {
/* Initialise output variables to 'sane' values */
*num_chars_to_copy = 0;
/* Determine index of first character to copy */ /* Determine index of first character to copy */
if (scroll_offset > 0) if (scroll_offset > 0)
{ {
*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 */
@ -510,6 +502,9 @@ static void gfx_animation_ticker_smooth_loop_fw(uint64_t idx,
unsigned scroll_offset = 0; unsigned scroll_offset = 0;
unsigned x_offset2 = 0; unsigned x_offset2 = 0;
*char_offset2 = 0;
*num_chars_to_copy2 = 0;
/* Check whether we've passed the end of string 1 */ /* Check whether we've passed the end of string 1 */
if (phase > str_width) if (phase > str_width)
scroll_offset = phase - str_width; scroll_offset = phase - str_width;
@ -654,21 +649,21 @@ static void gfx_animation_ticker_smooth_loop(uint64_t idx,
unsigned *x_offset, unsigned *dst_str_width) unsigned *x_offset, unsigned *dst_str_width)
{ {
unsigned ticker_period = str_width + spacer_width; unsigned ticker_period = str_width + spacer_width;
unsigned phase = idx % ticker_period; unsigned phase = idx % ticker_period;
unsigned remaining_width = field_width; unsigned remaining_width = field_width;
/* Initialise output variables to 'sane' values */ /* Initialise output variables to 'sane' values */
*char_offset1 = 0; *char_offset1 = 0;
*num_chars_to_copy1 = 0; *num_chars_to_copy1 = 0;
*char_offset2 = 0; *char_offset2 = 0;
*num_chars_to_copy2 = 0; *num_chars_to_copy2 = 0;
*char_offset3 = 0; *char_offset3 = 0;
*num_chars_to_copy3 = 0; *num_chars_to_copy3 = 0;
*x_offset = 0; *x_offset = 0;
if (dst_str_width) if (dst_str_width)
*dst_str_width = 0; *dst_str_width = 0;
/* Sanity check */ /* Sanity check */
if ((num_chars < 1) || (num_spacer_chars < 1)) if ((num_chars < 1) || (num_spacer_chars < 1))
@ -694,11 +689,11 @@ static void gfx_animation_ticker_smooth_loop(uint64_t idx,
char_offset1, num_chars_to_copy1, x_offset, &str1_width, &display_width); char_offset1, num_chars_to_copy1, x_offset, &str1_width, &display_width);
/* Update remaining width */ /* Update remaining width */
remaining_width -= display_width; remaining_width -= display_width;
/* Update dst_str_width */ /* Update dst_str_width */
if (dst_str_width) if (dst_str_width)
*dst_str_width += str1_width; *dst_str_width += str1_width;
} }
/* String 2 */ /* String 2 */
@ -1027,19 +1022,19 @@ bool gfx_animation_update(
* for an idx update */ * for an idx update */
if (ticker_pixel_accumulator_uint > 0) if (ticker_pixel_accumulator_uint > 0)
{ {
p_anim->ticker_pixel_idx += ticker_pixel_accumulator_uint; p_anim->ticker_pixel_idx += ticker_pixel_accumulator_uint;
ticker_pixel_accumulator -= (float)ticker_pixel_accumulator_uint; ticker_pixel_accumulator -= (float)ticker_pixel_accumulator_uint;
} }
if (ticker_pixel_accumulator_uint > 0) if (ticker_pixel_accumulator_uint > 0)
{ {
p_anim->ticker_pixel_line_idx += ticker_pixel_line_accumulator_uint; p_anim->ticker_pixel_line_idx += ticker_pixel_line_accumulator_uint;
ticker_pixel_line_accumulator -= (float)ticker_pixel_line_accumulator_uint; ticker_pixel_line_accumulator -= (float)ticker_pixel_line_accumulator_uint;
} }
} }
p_anim->flags |= GFX_ANIM_FLAG_IN_UPDATE; p_anim->flags |= GFX_ANIM_FLAG_IN_UPDATE;
p_anim->flags &= ~GFX_ANIM_FLAG_PENDING_DELETES; p_anim->flags &= ~GFX_ANIM_FLAG_PENDING_DELETES;
for (i = 0; i < RBUF_LEN(p_anim->list); i++) for (i = 0; i < RBUF_LEN(p_anim->list); i++)
{ {
@ -1232,8 +1227,8 @@ static bool gfx_animation_ticker_smooth_fw(
ticker->src_str, src_str_len); ticker->src_str, src_str_len);
if (ticker->dst_str_width) if (ticker->dst_str_width)
*ticker->dst_str_width = src_str_width; *ticker->dst_str_width = src_str_width;
*ticker->x_offset = 0; *ticker->x_offset = 0;
success = true; success = true;
goto end; goto end;
} }
@ -1370,10 +1365,10 @@ bool gfx_animation_ticker_smooth(gfx_animation_ctx_ticker_smooth_t *ticker)
gfx_animation_t *p_anim = &anim_st; gfx_animation_t *p_anim = &anim_st;
/* Sanity check */ /* Sanity check */
if (string_is_empty(ticker->src_str) || if ( string_is_empty(ticker->src_str)
(ticker->dst_str_len < 1) || || (ticker->dst_str_len < 1)
(ticker->field_width < 1) || || (ticker->field_width < 1)
(!ticker->font && (ticker->glyph_width < 1))) || (!ticker->font && (ticker->glyph_width < 1)))
goto end; goto end;
/* If we are using a fixed width font (ticker->font == NULL), /* If we are using a fixed width font (ticker->font == NULL),