libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-28 10:40:39 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(menu_animation) Delay realloc() by holding an index to the first dead animation

Browse Source
This commit is contained in:
Higor Eurípedes 2015-06-23 10:08:48 -03:00
parent c9ae127bc9
commit 5d8519c814
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
menu/menu_animation.c
View File

@ -295,6 +295,10 @@ void menu_animation_kill_by_subject(menu_animation_t *animation,
{
animation->list[i].alive = 0;
animation->list[i].subject = NULL;
if (i < animation->first_dead)
animation->first_dead = i;
killed++;
break;
}
@ -302,6 +306,27 @@ void menu_animation_kill_by_subject(menu_animation_t *animation,
}
}
static void menu_animation_push_internal(menu_animation_t *anim, const struct tween *t)
{
struct tween *target = NULL;
if (anim->first_dead < anim->size && !anim->list[anim->first_dead].alive)
target = &anim->list[anim->first_dead++];
else
{
if (anim->size >= anim->capacity)
{
anim->capacity++;
anim->list = (struct tween*)realloc(anim->list,
anim->capacity * sizeof(struct tween));
}
target = &anim->list[anim->size++];
}
*target = *t;
}
bool menu_animation_push(
menu_animation_t *anim,
float duration,
@ -441,23 +466,17 @@ bool menu_animation_push(
if (!t.easing || t.duration == 0 || t.initial_value == t.target_value)
return false;
if (anim->size >= anim->capacity)
{
anim->capacity++;
anim->list = (struct tween*)realloc(anim->list,
anim->capacity * sizeof(struct tween));
}
anim->list[anim->size++] = t;
menu_animation_push_internal(anim, &t);
return true;
}
static int menu_animation_iterate(
struct tween *tween,
float dt,
unsigned *active_tweens)
menu_animation_t *anim, unsigned idx,
float dt, unsigned *active_tweens)
{
struct tween *tween = &anim->list[idx];
if (!tween->alive)
return -1;
@ -474,6 +493,9 @@ static int menu_animation_iterate(
*tween->subject = tween->target_value;
tween->alive = 0;
if (idx < anim->first_dead)
anim->first_dead = idx;
if (tween->cb)
tween->cb();
}
@ -490,11 +512,12 @@ bool menu_animation_update(menu_animation_t *anim, float dt)
unsigned active_tweens = 0;
for(i = 0; i < anim->size; i++)
menu_animation_iterate(&anim->list[i], dt, &active_tweens);
menu_animation_iterate(anim, i, dt, &active_tweens);
if (!active_tweens)
{
anim->size = 0;
anim->first_dead = 0;
return false;
}

1
menu/menu_animation.h
View File

@ -51,6 +51,7 @@ typedef struct menu_animation
size_t capacity;
size_t size;
size_t first_dead;
bool is_active;
/* Delta timing */