CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-27 06:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename tween functions

Browse Source
This commit is contained in:
twinaphex 2015-02-10 23:45:14 +01:00
parent 9a6e99e12c
commit 453e5b7681
3 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
menu/drivers/xmb.c
View File

@ -493,10 +493,10 @@ static void xmb_selection_pointer_changed(void)
iz = xmb->i_active_zoom;
}
add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, ia, &node->label_alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, iz, &node->zoom, &inOutQuad, NULL);
add_tween(XMB_DELAY, iy, &node->y, &inOutQuad, NULL);
tweens_push(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, ia, &node->label_alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, iz, &node->zoom, &inOutQuad, NULL);
tweens_push(XMB_DELAY, iy, &node->y, &inOutQuad, NULL);
}
}
@ -521,9 +521,9 @@ static void xmb_list_open_old(file_list_t *list, int dir, size_t current)
if (dir == -1)
ia = 0;
add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, 0, &node->label_alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, xmb->icon_size*dir*-2, &node->x, &inOutQuad, NULL);
tweens_push(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, 0, &node->label_alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, xmb->icon_size*dir*-2, &node->x, &inOutQuad, NULL);
}
}
@ -567,9 +567,9 @@ static void xmb_list_open_new(file_list_t *list, int dir, size_t current)
if (i == current)
ia = xmb->i_active_alpha;
add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, ia, &node->label_alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, 0, &node->x, &inOutQuad, NULL);
tweens_push(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, ia, &node->label_alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, 0, &node->x, &inOutQuad, NULL);
}
xmb->old_depth = xmb->depth;
@ -699,9 +699,9 @@ static void xmb_list_switch_old(file_list_t *list, int dir, size_t current)
if (!xmb)
continue;
add_tween(XMB_DELAY, 0, &node->alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, 0, &node->label_alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, -xmb->hspacing*dir, &node->x, &inOutQuad, NULL);
tweens_push(XMB_DELAY, 0, &node->alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, 0, &node->label_alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, -xmb->hspacing*dir, &node->x, &inOutQuad, NULL);
}
}
@ -729,9 +729,9 @@ static void xmb_list_switch_new(file_list_t *list, int dir, size_t current)
if (i == current)
ia = 1.0;
add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, ia, &node->label_alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, 0, &node->x, &inOutQuad, NULL);
tweens_push(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, ia, &node->label_alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, 0, &node->x, &inOutQuad, NULL);
}
}
@ -795,11 +795,11 @@ static void xmb_list_open(void)
iz = xmb->c_active_zoom;
}
add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
add_tween(XMB_DELAY, iz, &node->zoom, &inOutQuad, NULL);
tweens_push(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, iz, &node->zoom, &inOutQuad, NULL);
}
add_tween(XMB_DELAY, xmb->hspacing * -(float)driver.menu->cat_selection_ptr,
tweens_push(XMB_DELAY, xmb->hspacing * -(float)driver.menu->cat_selection_ptr,
&xmb->categories_x, &inOutQuad, NULL);
dir = -1;
@ -840,7 +840,7 @@ static void xmb_list_switch(void)
else if (xmb->depth <= 1)
ia = xmb->c_passive_alpha;
add_tween(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, ia, &node->alpha, &inOutQuad, NULL);
}
xmb_list_open_old(xmb->selection_buf_old, dir, xmb->selection_ptr_old);
@ -849,12 +849,12 @@ static void xmb_list_switch(void)
switch (xmb->depth)
{
case 1:
add_tween(XMB_DELAY, xmb->icon_size*-(xmb->depth*2-2), &xmb->x, &inOutQuad, NULL);
add_tween(XMB_DELAY, 0, &xmb->arrow_alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, xmb->icon_size*-(xmb->depth*2-2), &xmb->x, &inOutQuad, NULL);
tweens_push(XMB_DELAY, 0, &xmb->arrow_alpha, &inOutQuad, NULL);
break;
case 2:
add_tween(XMB_DELAY, xmb->icon_size*-(xmb->depth*2-2), &xmb->x, &inOutQuad, NULL);
add_tween(XMB_DELAY, 1, &xmb->arrow_alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, xmb->icon_size*-(xmb->depth*2-2), &xmb->x, &inOutQuad, NULL);
tweens_push(XMB_DELAY, 1, &xmb->arrow_alpha, &inOutQuad, NULL);
break;
}
@ -1062,7 +1062,7 @@ static void xmb_frame(void)
if (!xmb || !gl)
return;
update_tweens(driver.menu->tweens, 0.002);
tweens_update(driver.menu->tweens, 0.002);
glViewport(0, 0, gl->win_width, gl->win_height);
@ -1670,7 +1670,7 @@ static void xmb_toggle(bool menu_on)
return;
}
add_tween(XMB_DELAY, 1.0f, &xmb->alpha, &inOutQuad, NULL);
tweens_push(XMB_DELAY, 1.0f, &xmb->alpha, &inOutQuad, NULL);
xmb->prevent_populate = !menu->need_refresh;

9
menu/menu_animation.c
View File

@ -22,10 +22,9 @@ void tweens_free(tween_t *tween)
{
if (tween)
free(tween);
tween = NULL;
}
bool add_tween(float duration, float target_value, float* subject,
bool tweens_push(float duration, float target_value, float* subject,
easingFunc easing, tween_cb cb)
{
tween_t *tween = NULL, *temp_tweens = NULL;
@ -59,7 +58,7 @@ bool add_tween(float duration, float target_value, float* subject,
return true;
}
static int iterate_tween(tween_t *tween, float dt,
static int tweens_iterate(tween_t *tween, float dt,
unsigned *active_tweens)
{
if (!tween)
@ -90,13 +89,13 @@ static int iterate_tween(tween_t *tween, float dt,
return 0;
}
void update_tweens(tween_t *tweens, float dt)
void tweens_update(tween_t *tweens, float dt)
{
unsigned i;
unsigned active_tweens = 0;
for(i = 0; i < driver.menu->numtweens; i++)
iterate_tween(&tweens[i], dt, &active_tweens);
tweens_iterate(&tweens[i], dt, &active_tweens);
if (!active_tweens)
driver.menu->numtweens = 0;

4
menu/menu_animation.h
View File

@ -40,10 +40,10 @@ typedef struct
tween_cb cb;
} tween_t;
bool add_tween(float duration, float target_value, float* subject,
bool tweens_push(float duration, float target_value, float* subject,
easingFunc easing, tween_cb cb);
void update_tweens(tween_t *tweens, float dt);
void tweens_update(tween_t *tweens, float dt);
/* from https://github.com/kikito/tween.lua/blob/master/tween.lua */