From 2faeeb32960cf5a956aa4b0106ffdc283dcd5338 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Thu, 25 May 2023 10:45:21 +0200 Subject: [PATCH] rename transition --- includes/animations.h | 4 ++-- main.c | 2 +- shaders/{rotation.fs => twister.fs} | 0 src/animations.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename shaders/{rotation.fs => twister.fs} (100%) diff --git a/includes/animations.h b/includes/animations.h index 3add1e6..f483f40 100644 --- a/includes/animations.h +++ b/includes/animations.h @@ -23,8 +23,8 @@ void transitionsInit(void); // Transition zoom void zoomIn(void (*)(int), void (*)(int), Uint32, Uint32, const int); -// Transition qui tourne -void rotation(void (*)(int), void (*)(int), Uint32, Uint32, const int); +// Transition qui se déforme +void twisting(void (*)(int), void (*)(int), Uint32, Uint32, const int); // Personnage struct manifestant { diff --git a/main.c b/main.c index 973b599..4605f95 100644 --- a/main.c +++ b/main.c @@ -23,7 +23,7 @@ int main(const int argc, char *argv[]) { GL4DHanime animations[] = {{10000, manif, NULL, NULL}, // Manifestation {2000, manif, tag, zoomIn}, // Transition {10000, tag, NULL, NULL}, // Tag - {2000, tag, credits, rotation}, // Transition + {2000, tag, credits, twisting}, // Transition {9500, credits, NULL, NULL}, // Crédits {0, NULL, NULL, NULL}}; diff --git a/shaders/rotation.fs b/shaders/twister.fs similarity index 100% rename from shaders/rotation.fs rename to shaders/twister.fs diff --git a/src/animations.c b/src/animations.c index 889bca9..04bd6d8 100644 --- a/src/animations.c +++ b/src/animations.c @@ -196,13 +196,13 @@ void drawManifestant(const char *matrix_model, const struct manifestant *hero, gl4dgDraw(hero->bras_d); } -void rotation(void (*a0)(int), void (*a1)(int), Uint32 t, Uint32 et, +void twisting(void (*a0)(int), void (*a1)(int), Uint32 t, Uint32 et, const int state) { const int gpu = 1; static GLuint tex[2]; switch (state) { case GL4DH_INIT: - transition_init("rotation", gpu, tex); + transition_init("twister", gpu, tex); break; case GL4DH_DRAW: