mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-26 02:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-02-02 00:46:00 +01:00
parent b692e6ee9d
commit 486a5801c0
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
menu/menu_animation.c
View File

@ -26,9 +26,9 @@ static void tween_free(tween_t *tween)
} }
bool add_tween(float duration, float target_value, float* subject, bool add_tween(float duration, float target_value, float* subject,
easingFunc easing, tweenCallback callback) easingFunc easing, tween_cb cb)
{ {
tween_t *tween = NULL, *temp_tweens = NULL; tween_t *tween = NULL, *temp_tweens = NULL;
if (!driver.menu) if (!driver.menu)
return false; return false;
@ -55,7 +55,7 @@ bool add_tween(float duration, float target_value, float* 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->cb = cb;
driver.menu->numtweens++; driver.menu->numtweens++;
@ -88,8 +88,8 @@ void update_tweens(float dt)
{ {
*tween->subject = tween->target_value; *tween->subject = tween->target_value;
if (tween->callback) if (tween->cb)
tween->callback(); tween->cb();
} }
if (tween->running_since < tween->duration) if (tween->running_since < tween->duration)
@ -100,14 +100,14 @@ void update_tweens(float dt)
driver.menu->numtweens = 0; driver.menu->numtweens = 0;
} }
// linear /* Linear */
float linear(float t, float b, float c, float d) float linear(float t, float b, float c, float d)
{ {
return c * t / d + b; return c * t / d + b;
} }
// quad /* Quad */
float inQuad(float t, float b, float c, float d) float inQuad(float t, float b, float c, float d)
{ {
@ -135,7 +135,7 @@ float outInQuad(float t, float b, float c, float d)
return inQuad((t * 2) - d, b + c / 2, c / 2, d); return inQuad((t * 2) - d, b + c / 2, c / 2, d);
} }
// cubic /* Cubic */
float inCubic(float t, float b, float c, float d) float inCubic(float t, float b, float c, float d)
{ {
@ -163,7 +163,7 @@ float outInCubic(float t, float b, float c, float d)
return inCubic((t * 2) - d, b + c / 2, c / 2, d); return inCubic((t * 2) - d, b + c / 2, c / 2, d);
} }
// quart /* Quart */
float inQuart(float t, float b, float c, float d) float inQuart(float t, float b, float c, float d)
{ {
@ -190,7 +190,7 @@ float outInQuart(float t, float b, float c, float d)
return inQuart((t * 2) - d, b + c / 2, c / 2, d); return inQuart((t * 2) - d, b + c / 2, c / 2, d);
} }
// quint /* Quint */
float inQuint(float t, float b, float c, float d) float inQuint(float t, float b, float c, float d)
{ {
@ -217,7 +217,7 @@ float outInQuint(float t, float b, float c, float d)
return inQuint((t * 2) - d, b + c / 2, c / 2, d); return inQuint((t * 2) - d, b + c / 2, c / 2, d);
} }
// sine /* Sine */
float inSine(float t, float b, float c, float d) float inSine(float t, float b, float c, float d)
{ {
@ -241,7 +241,7 @@ float outInSine(float t, float b, float c, float d)
return inSine((t * 2) -d, b + c / 2, c / 2, d); return inSine((t * 2) -d, b + c / 2, c / 2, d);
} }
// expo /* Expo */
float inExpo(float t, float b, float c, float d) float inExpo(float t, float b, float c, float d)
{ {
@ -276,7 +276,7 @@ float outInExpo(float t, float b, float c, float d)
return inExpo((t * 2) - d, b + c / 2, c / 2, d); return inExpo((t * 2) - d, b + c / 2, c / 2, d);
} }
// circ /* Circ */
float inCirc(float t, float b, float c, float d) float inCirc(float t, float b, float c, float d)
{ {
@ -304,7 +304,7 @@ float outInCirc(float t, float b, float c, float d)
return inCirc((t * 2) - d, b + c / 2, c / 2, d); return inCirc((t * 2) - d, b + c / 2, c / 2, d);
} }
// bounce /* Bounce */
float outBounce(float t, float b, float c, float d) float outBounce(float t, float b, float c, float d)
{ {

6
menu/menu_animation.h
View File

@ -26,7 +26,7 @@ extern "C" {
#endif #endif
typedef float (*easingFunc)(float, float, float, float); typedef float (*easingFunc)(float, float, float, float);
typedef void (*tweenCallback) (void); typedef void (*tween_cb) (void);
typedef struct typedef struct
{ {
@ -37,11 +37,11 @@ typedef struct
float target_value; float target_value;
float* subject; float* subject;
easingFunc easing; easingFunc easing;
tweenCallback callback; tween_cb cb;
} tween_t; } tween_t;
bool add_tween(float duration, float target_value, float* subject, bool add_tween(float duration, float target_value, float* subject,
easingFunc easing, tweenCallback callback); easingFunc easing, tween_cb cb);
void update_tweens(float dt); void update_tweens(float dt);