ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(menu_animation.c) Cleanups

This commit is contained in:
twinaphex 2015-02-01 22:45:56 +01:00
parent 50a9b8478d
commit 6e0d769fec
1 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
menu/menu_animation.c
View File

@ -30,72 +30,67 @@ static void tween_free(tween_t *tw)
void add_tween(float duration, float target_value, float* subject, void add_tween(float duration, float target_value, float* subject,
easingFunc easing, tweenCallback callback) easingFunc easing, tweenCallback callback)
{ {
tween_t *tween = NULL; tween_t *tween = NULL;
tween_t *temp_tweens = (tween_t*) tween_t *temp_tweens = (tween_t*)
realloc(tweens, (numtweens + 1) * sizeof(tween_t)); realloc(tweens, (numtweens + 1) * sizeof(tween_t));
if (temp_tweens) if (!temp_tweens)
{
tweens = temp_tweens;
}
else /* Realloc failed. */
{ {
tween_free(tweens); tween_free(tweens);
return; return;
} }
numtweens++; tweens = temp_tweens;
tween = (tween_t*)&tweens[numtweens-1]; tween = (tween_t*)&tweens[numtweens];
if (!tween) if (!tween)
return; return;
tween->alive = 1; tween->alive = 1;
tween->duration = duration; tween->duration = duration;
tween->running_since = 0; tween->running_since = 0;
tween->initial_value = *subject; tween->initial_value = *subject;
tween->target_value = target_value; tween->target_value = target_value;
tween->subject = subject; tween->subject = subject;
tween->easing = easing; tween->easing = easing;
tween->callback = callback; tween->callback = callback;
}
static void update_tween(tween_t *tween, float dt, int *active_tweens) numtweens++;
{
if (!tween)
return;
if (tween->running_since >= tween->duration)
return;
tween->running_since += dt;
if (tween->easing)
*tween->subject = tween->easing(
tween->running_since,
tween->initial_value,
tween->target_value - tween->initial_value,
tween->duration);
if (tween->running_since >= tween->duration)
{
*tween->subject = tween->target_value;
if (tween->callback)
tween->callback();
}
if (tween->running_since < tween->duration)
*active_tweens += 1;
} }
void update_tweens(float dt) void update_tweens(float dt)
{ {
int i; unsigned i;
int active_tweens = 0; unsigned active_tweens = 0;
for(i = 0; i < numtweens; i++) for(i = 0; i < numtweens; i++)
update_tween(&tweens[i], dt, &active_tweens); {
tween_t *tween = &tweens[i];
if (!tween)
continue;
if (tween->running_since >= tween->duration)
continue;
tween->running_since += dt;
if (tween->easing)
*tween->subject = tween->easing(
tween->running_since,
tween->initial_value,
tween->target_value - tween->initial_value,
tween->duration);
if (tween->running_since >= tween->duration)
{
*tween->subject = tween->target_value;
if (tween->callback)
tween->callback();
}
if (tween->running_since < tween->duration)
active_tweens += 1;
}
if (!active_tweens) if (!active_tweens)
numtweens = 0; numtweens = 0;