From e6ab59bce222231bade8459dac1ef3836a5c0b02 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 10 Feb 2015 23:35:22 +0100 Subject: [PATCH] Refactor update_tweens --- menu/drivers/xmb.c | 2 +- menu/menu_animation.c | 5 ++--- menu/menu_animation.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index b2fe940e40..283ad72204 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1062,7 +1062,7 @@ static void xmb_frame(void) if (!xmb || !gl) return; - update_tweens(0.002); + update_tweens(driver.menu->tweens, 0.002); glViewport(0, 0, gl->win_width, gl->win_height); diff --git a/menu/menu_animation.c b/menu/menu_animation.c index 7c95fbdded..3c8c56630c 100644 --- a/menu/menu_animation.c +++ b/menu/menu_animation.c @@ -93,14 +93,13 @@ static int iterate_tween(tween_t *tween, float dt, return 0; } -void update_tweens(float dt) +void update_tweens(tween_t *tweens, float dt) { unsigned i; unsigned active_tweens = 0; - tween_t *tween = &driver.menu->tweens[0]; for(i = 0; i < driver.menu->numtweens; i++) - iterate_tween(tween++, dt, &active_tweens); + iterate_tween(&tweens[i], dt, &active_tweens); if (!active_tweens) driver.menu->numtweens = 0; diff --git a/menu/menu_animation.h b/menu/menu_animation.h index fdc2e5cc11..743050db2c 100644 --- a/menu/menu_animation.h +++ b/menu/menu_animation.h @@ -43,7 +43,7 @@ typedef struct bool add_tween(float duration, float target_value, float* subject, easingFunc easing, tween_cb cb); -void update_tweens(float dt); +void update_tweens(tween_t *tweens, float dt); /* from https://github.com/kikito/tween.lua/blob/master/tween.lua */