Rename file and move credit on top of file
This commit is contained in:
parent
5581b9cadb
commit
97fdcd163e
4 changed files with 7 additions and 7 deletions
|
@ -1,7 +1,7 @@
|
||||||
#include "../includes/animations.h"
|
|
||||||
|
|
||||||
/* TP6 */
|
/* TP6 */
|
||||||
|
|
||||||
|
#include "../includes/animations.h"
|
||||||
|
|
||||||
void cube(int etat) {
|
void cube(int etat) {
|
||||||
static GLuint cube = 0, proc_id = 0;
|
static GLuint cube = 0, proc_id = 0;
|
||||||
static GLclampf rgb[3] = { 0 };
|
static GLclampf rgb[3] = { 0 };
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "../includes/animations.h"
|
|
||||||
|
|
||||||
/* Auteur : Farès BELHADJ (amsi@up8.edu) */
|
/* 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) {
|
void fondu(void (*ancienne_anim)(int), void (*nouvelle_anim)(int), Uint32 temps_total, Uint32 temps_ecoule, int etat) {
|
||||||
GLint viewport[4];
|
GLint viewport[4];
|
||||||
GLint tex_id = 0;
|
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);
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, viewport[2], viewport[3], 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
proc_id = gl4duCreateProgram("<vs>shaders/fondu.vs", "<fs>shaders/fondu.fs", NULL);
|
proc_id = gl4duCreateProgram("<vs>shaders/transition.vs", "<fs>shaders/fondu.fs", NULL);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GL4DH_UPDATE_WITH_AUDIO:
|
case GL4DH_UPDATE_WITH_AUDIO:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "../includes/animations.h"
|
|
||||||
|
|
||||||
/* TP6 */
|
/* TP6 */
|
||||||
|
|
||||||
|
#include "../includes/animations.h"
|
||||||
|
|
||||||
// Initialise le diagramme de Voronoi
|
// Initialise le diagramme de Voronoi
|
||||||
void diag_init(int, GLfloat **, GLfloat **);
|
void diag_init(int, GLfloat **, GLfloat **);
|
||||||
|
|
||||||
|
|
Reference in a new issue