macro bind and load
This commit is contained in:
parent
378398193c
commit
192861f2a9
4 changed files with 11 additions and 7 deletions
|
@ -1,8 +1,6 @@
|
||||||
#ifndef DEMO_ANIMATION_H
|
#ifndef DEMO_ANIMATION_H
|
||||||
#define DEMO_ANIMATION_H 1
|
#define DEMO_ANIMATION_H 1
|
||||||
|
|
||||||
#include <GL4D/gl4duw_SDL2.h>
|
|
||||||
|
|
||||||
#include "audio.h"
|
#include "audio.h"
|
||||||
#include "font.h"
|
#include "font.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
#ifndef DEMO_UTILS_H
|
#ifndef DEMO_UTILS_H
|
||||||
#define DEMO_UTILS_H 1
|
#define DEMO_UTILS_H 1
|
||||||
|
|
||||||
#include <GL4D/gl4dummies.h>
|
#include <GL4D/gl4duw_SDL2.h>
|
||||||
|
|
||||||
// Récupère un delta-temps
|
// Récupère un delta-temps
|
||||||
double get_dt(double *, GLboolean);
|
double get_dt(double *, GLboolean);
|
||||||
|
|
||||||
|
// Bind and load a matrix
|
||||||
|
void bindAndLoadf(const char *name);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -67,12 +67,10 @@ static void draw(void) {
|
||||||
GLfloat dt = .25f * (GLfloat)get_dt(&t0, GL_FALSE) - 1.1f;
|
GLfloat dt = .25f * (GLfloat)get_dt(&t0, GL_FALSE) - 1.1f;
|
||||||
|
|
||||||
GLfloat ratio = (GLfloat)_dims[0] / (GLfloat)_dims[1];
|
GLfloat ratio = (GLfloat)_dims[0] / (GLfloat)_dims[1];
|
||||||
gl4duBindMatrix(matrix_proj);
|
bindAndLoadf(matrix_proj);
|
||||||
gl4duLoadIdentityf();
|
|
||||||
gl4duFrustumf(-ratio, ratio, -1, 1, 2, 100);
|
gl4duFrustumf(-ratio, ratio, -1, 1, 2, 100);
|
||||||
|
|
||||||
gl4duBindMatrix(matrix_modview);
|
bindAndLoadf(matrix_modview);
|
||||||
gl4duLoadIdentityf();
|
|
||||||
|
|
||||||
gl4duTranslatef(0.f, dt, -2.f);
|
gl4duTranslatef(0.f, dt, -2.f);
|
||||||
glActiveTexture(GL_TEXTURE0);
|
glActiveTexture(GL_TEXTURE0);
|
||||||
|
|
|
@ -8,3 +8,8 @@ double get_dt(double *t0, GLboolean override_t0) {
|
||||||
|
|
||||||
return dt;
|
return dt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void bindAndLoadf(const char *name) {
|
||||||
|
gl4duBindMatrix(name);
|
||||||
|
gl4duLoadIdentityf();
|
||||||
|
}
|
||||||
|
|
Reference in a new issue