josh/glsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

name matrix functions consistently

Browse Source
This commit is contained in:
Josh Holtrop 2011-05-11 09:48:36 -04:00
parent a278d1843f
commit 5389b9ea0e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glslUtil/glslUtil.c
View File

@ -141,7 +141,7 @@ void guMatrixFrustum(guMatrix4x4 *m,
guMatrixMult(m, m, &mult); guMatrixMult(m, m, &mult);
} }
void guPerspective(guMatrix4x4 *m, GLfloat fovy, GLfloat aspect, void guMatrixPerspective(guMatrix4x4 *m, GLfloat fovy, GLfloat aspect,
GLfloat near, GLfloat far) GLfloat near, GLfloat far)
{ {
int i, j; int i, j;
@ -163,7 +163,7 @@ void guPerspective(guMatrix4x4 *m, GLfloat fovy, GLfloat aspect,
guMatrixMult(m, m, &mult); guMatrixMult(m, m, &mult);
} }
void guOrtho(guMatrix4x4 *m, void guMatrixOrtho(guMatrix4x4 *m,
GLfloat left, GLfloat right, GLfloat left, GLfloat right,
GLfloat bottom, GLfloat top, GLfloat bottom, GLfloat top,
GLfloat near, GLfloat far) GLfloat near, GLfloat far)

8
glslUtil/glslUtil.h
View File

@ -28,17 +28,17 @@ void guMatrixFrustum(guMatrix4x4 *m,
GLfloat left, GLfloat right, GLfloat left, GLfloat right,
GLfloat bottom, GLfloat top, GLfloat bottom, GLfloat top,
GLfloat near, GLfloat far); GLfloat near, GLfloat far);
void guPerspective(guMatrix4x4 *m, GLfloat fovy, GLfloat aspect, void guMatrixPerspective(guMatrix4x4 *m, GLfloat fovy, GLfloat aspect,
GLfloat near, GLfloat far); GLfloat near, GLfloat far);
void guOrtho(guMatrix4x4 *m, void guMatrixOrtho(guMatrix4x4 *m,
GLfloat left, GLfloat right, GLfloat left, GLfloat right,
GLfloat bottom, GLfloat top, GLfloat bottom, GLfloat top,
GLfloat near, GLfloat far); GLfloat near, GLfloat far);
char *guGetShaderLog(GLuint id); char *guGetShaderLog(GLuint id);
char *guGetProgramLog(GLuint id); char *guGetProgramLog(GLuint id);
GLuint guMakeShaderFromFile(GLenum shaderType, const char *fname); GLuint guMakeShaderFromFile(GLenum shaderType, const char *fname);
GLuint guMakeShader(GLenum shaderType, const char *source); GLuint guMakeShader(GLenum shaderType, const char *source);
GLuint guMakeBuffer(GLenum target, GLenum usage, const void *ptr, size_t sz);
GLuint guMakeProgramFromSource(const char *v_shader, const char *f_shader, GLuint guMakeProgramFromSource(const char *v_shader, const char *f_shader,
const guAttribBinding *bindings); const guAttribBinding *bindings);
GLuint guMakeProgramFromFiles(const char *v_shader, const char *f_shader, GLuint guMakeProgramFromFiles(const char *v_shader, const char *f_shader,
@ -46,6 +46,8 @@ GLuint guMakeProgramFromFiles(const char *v_shader, const char *f_shader,
GLuint guMakeProgram(GLuint v_shader_id, GLuint f_shader_id, GLuint guMakeProgram(GLuint v_shader_id, GLuint f_shader_id,
const guAttribBinding *bindings); const guAttribBinding *bindings);
GLuint guMakeBuffer(GLenum target, GLenum usage, const void *ptr, size_t sz);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif