From 97fdcd163e9fb660353e5d0d4c4295f15067d021 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 16 May 2022 13:55:06 +0200 Subject: [PATCH] Rename file and move credit on top of file --- shaders/{fondu.vs => transition.vs} | 0 src/cube.c | 4 ++-- src/fondu.c | 6 +++--- src/voronoi.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename shaders/{fondu.vs => transition.vs} (100%) diff --git a/shaders/fondu.vs b/shaders/transition.vs similarity index 100% rename from shaders/fondu.vs rename to shaders/transition.vs diff --git a/src/cube.c b/src/cube.c index 4a17519..0d64357 100644 --- a/src/cube.c +++ b/src/cube.c @@ -1,7 +1,7 @@ -#include "../includes/animations.h" - /* TP6 */ +#include "../includes/animations.h" + void cube(int etat) { static GLuint cube = 0, proc_id = 0; static GLclampf rgb[3] = { 0 }; diff --git a/src/fondu.c b/src/fondu.c index 7d9ac3a..0946360 100644 --- a/src/fondu.c +++ b/src/fondu.c @@ -1,7 +1,7 @@ -#include "../includes/animations.h" - /* Auteur : Farès BELHADJ (amsi@up8.edu) */ +#include "../includes/animations.h" + void fondu(void (*ancienne_anim)(int), void (*nouvelle_anim)(int), Uint32 temps_total, Uint32 temps_ecoule, int etat) { GLint viewport[4]; GLint tex_id = 0; @@ -24,7 +24,7 @@ void fondu(void (*ancienne_anim)(int), void (*nouvelle_anim)(int), Uint32 temps_ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, viewport[2], viewport[3], 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); } - proc_id = gl4duCreateProgram("shaders/fondu.vs", "shaders/fondu.fs", NULL); + proc_id = gl4duCreateProgram("shaders/transition.vs", "shaders/fondu.fs", NULL); break; case GL4DH_UPDATE_WITH_AUDIO: diff --git a/src/voronoi.c b/src/voronoi.c index 13fb8fd..20915a4 100644 --- a/src/voronoi.c +++ b/src/voronoi.c @@ -1,7 +1,7 @@ -#include "../includes/animations.h" - /* TP6 */ +#include "../includes/animations.h" + // Initialise le diagramme de Voronoi void diag_init(int, GLfloat **, GLfloat **);