diff --git a/shaders/fondu.fs b/shaders/fondu.fs index dcffecf..360bef9 100644 --- a/shaders/fondu.fs +++ b/shaders/fondu.fs @@ -1,3 +1,5 @@ +/* Auteur : Farès BELHADJ (amsi@up8.edu) */ + #version 330 uniform float delta_temps; diff --git a/shaders/fondu.vs b/shaders/fondu.vs index 2472da9..f9b9ee3 100644 --- a/shaders/fondu.vs +++ b/shaders/fondu.vs @@ -1,3 +1,5 @@ +/* Auteur : Farès BELHADJ (amsi@up8.edu) */ + #version 330 layout (location = 0) in vec3 vsiPosition; diff --git a/src/cube.c b/src/cube.c index 818531e..b2ba386 100644 --- a/src/cube.c +++ b/src/cube.c @@ -1,5 +1,7 @@ #include "../includes/animations.h" +/* TP6 */ + void cube(int etat) { static GLuint cube = 0, proc_id = 0; @@ -9,9 +11,9 @@ void cube(int etat) { switch(etat) { case GL4DH_INIT: - r = (rand() / (float)(RAND_MAX)) * 1.f; - g = (rand() / (float)(RAND_MAX)) * 1.f; - b = (rand() / (float)(RAND_MAX)) * 1.f; + r = rand() / (float)RAND_MAX; + g = rand() / (float)RAND_MAX; + b = rand() / (float)RAND_MAX; cube = gl4dgGenCubef(); proc_id = gl4duCreateProgram("shaders/cube.vs", "shaders/cube.fs", NULL); diff --git a/src/cube2.c b/src/cube2.c index b057fc1..e5cbc2a 100644 --- a/src/cube2.c +++ b/src/cube2.c @@ -1,5 +1,7 @@ #include "../includes/animations.h" +/* TP6 */ + void cube2(int etat) { static GLuint cube = 0, proc_id = 0; @@ -9,9 +11,9 @@ void cube2(int etat) { switch(etat) { case GL4DH_INIT: - r = (rand() / (float)(RAND_MAX)) * 1.f; - g = (rand() / (float)(RAND_MAX)) * 1.f; - b = (rand() / (float)(RAND_MAX)) * 1.f; + r = rand() / (float)RAND_MAX; + g = rand() / (float)RAND_MAX; + b = rand() / (float)RAND_MAX; cube = gl4dgGenCubef(); proc_id = gl4duCreateProgram("shaders/cube.vs", "shaders/cube.fs", NULL); diff --git a/src/fondu.c b/src/fondu.c index 32c1db7..5d748c7 100644 --- a/src/fondu.c +++ b/src/fondu.c @@ -1,6 +1,6 @@ #include "../includes/animations.h" -/* Fondu de Farès BELHADJ */ +/* Auteur : Farès BELHADJ (amsi@up8.edu) */ void fondu(void (* ancienne_anim)(int), void (* nouvelle_anim)(int), Uint32 temps_total, Uint32 temps_ecoule, int etat) { GLint viewport[4];