rename transition
This commit is contained in:
parent
c81125e480
commit
2faeeb3296
4 changed files with 5 additions and 5 deletions
|
@ -23,8 +23,8 @@ void transitionsInit(void);
|
||||||
// Transition zoom
|
// Transition zoom
|
||||||
void zoomIn(void (*)(int), void (*)(int), Uint32, Uint32, const int);
|
void zoomIn(void (*)(int), void (*)(int), Uint32, Uint32, const int);
|
||||||
|
|
||||||
// Transition qui tourne
|
// Transition qui se déforme
|
||||||
void rotation(void (*)(int), void (*)(int), Uint32, Uint32, const int);
|
void twisting(void (*)(int), void (*)(int), Uint32, Uint32, const int);
|
||||||
|
|
||||||
// Personnage
|
// Personnage
|
||||||
struct manifestant {
|
struct manifestant {
|
||||||
|
|
2
main.c
2
main.c
|
@ -23,7 +23,7 @@ int main(const int argc, char *argv[]) {
|
||||||
GL4DHanime animations[] = {{10000, manif, NULL, NULL}, // Manifestation
|
GL4DHanime animations[] = {{10000, manif, NULL, NULL}, // Manifestation
|
||||||
{2000, manif, tag, zoomIn}, // Transition
|
{2000, manif, tag, zoomIn}, // Transition
|
||||||
{10000, tag, NULL, NULL}, // Tag
|
{10000, tag, NULL, NULL}, // Tag
|
||||||
{2000, tag, credits, rotation}, // Transition
|
{2000, tag, credits, twisting}, // Transition
|
||||||
{9500, credits, NULL, NULL}, // Crédits
|
{9500, credits, NULL, NULL}, // Crédits
|
||||||
{0, NULL, NULL, NULL}};
|
{0, NULL, NULL, NULL}};
|
||||||
|
|
||||||
|
|
|
@ -196,13 +196,13 @@ void drawManifestant(const char *matrix_model, const struct manifestant *hero,
|
||||||
gl4dgDraw(hero->bras_d);
|
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 state) {
|
||||||
const int gpu = 1;
|
const int gpu = 1;
|
||||||
static GLuint tex[2];
|
static GLuint tex[2];
|
||||||
switch (state) {
|
switch (state) {
|
||||||
case GL4DH_INIT:
|
case GL4DH_INIT:
|
||||||
transition_init("rotation", gpu, tex);
|
transition_init("twister", gpu, tex);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GL4DH_DRAW:
|
case GL4DH_DRAW:
|
||||||
|
|
Reference in a new issue