diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-08-03 11:31:33 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-08-03 11:31:33 -0700 |
| commit | dbc4b661a3cfb7c99f48de665cc827462845f617 (patch) | |
| tree | eb8470e76a1661ecd42e12a6c59915ab1076a960 | |
| parent | e5529ba2eb388c1c108de47b4846908bf455cbd1 (diff) | |
Fix function names to match OpenGL naming conventions
Several functions just had a number specifying the parameter count,
but they were missing the type specifier.
| -rw-r--r-- | include/glu3.h | 8 | ||||
| -rw-r--r-- | include/glu3_scalar.h | 6 | ||||
| -rw-r--r-- | src/matrix.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/glu3.h b/include/glu3.h index 7760744..df3aeaf 100644 --- a/include/glu3.h +++ b/include/glu3.h @@ -153,14 +153,14 @@ void gluMult4m_4v(GLUvec4 *result, const GLUmat4 *m, const GLUvec4 *v); void gluMult4m_f(GLUmat4 *result, const GLUmat4 *, GLfloat); void gluScale4v(GLUmat4 *result, const GLUvec4 *); -void gluTranslate3(GLUmat4 *result, GLfloat x, GLfloat y, GLfloat z); +void gluTranslate3f(GLUmat4 *result, GLfloat x, GLfloat y, GLfloat z); void gluTranslate4v(GLUmat4 *result, const GLUvec4 *); void gluRotate4v(GLUmat4 *result, const GLUvec4 *axis, GLfloat angle); void gluLookAt4v(GLUmat4 *result, const GLUvec4 *eye, const GLUvec4 *center, const GLUvec4 *up); -void gluPerspective4(GLUmat4 *result, GLfloat fovy, GLfloat aspect, - GLfloat near, GLfloat far); -void gluTranspose4(GLUmat4 *result, const GLUmat4 *m); +void gluPerspective4f(GLUmat4 *result, GLfloat fovy, GLfloat aspect, + GLfloat near, GLfloat far); +void gluTranspose4m(GLUmat4 *result, const GLUmat4 *m); extern const GLUmat4 gluIdentityMatrix; diff --git a/include/glu3_scalar.h b/include/glu3_scalar.h index c6f2a84..3e87b8c 100644 --- a/include/glu3_scalar.h +++ b/include/glu3_scalar.h @@ -229,7 +229,7 @@ extern inline void gluNormalize4v(GLUvec4 *result, const GLUvec4 *v) -extern inline void gluTranspose4(GLUmat4 *result, const GLUmat4 *m) +extern inline void gluTranspose4m(GLUmat4 *result, const GLUmat4 *m) { unsigned i; unsigned j; @@ -260,8 +260,8 @@ extern inline void gluMult4m_4m(GLUmat4 *result, -extern inline void gluTranslate3(GLUmat4 *result, - GLfloat x, GLfloat y, GLfloat z) +extern inline void gluTranslate3f(GLUmat4 *result, + GLfloat x, GLfloat y, GLfloat z) { memcpy(result, & gluIdentityMatrix, sizeof(gluIdentityMatrix)); result->col[3].values[0] = x; diff --git a/src/matrix.c b/src/matrix.c index db3bd8d..280d315 100644 --- a/src/matrix.c +++ b/src/matrix.c @@ -90,7 +90,7 @@ void gluLookAt4v(GLUmat4 *result, rotate.col[2].values[2] = -f.values[2]; rotate.col[2].values[3] = 0.0f; rotate.col[3] = col3; - gluTranspose4(& rotateT, & rotate); + gluTranspose4m(& rotateT, & rotate); gluTranslate4v(& translate, & e); gluMult4m_4m(result, & rotateT, & translate); @@ -156,8 +156,8 @@ void gluRotate4v(GLUmat4 *result, const GLUvec4 *_axis, GLfloat angle) void -gluPerspective4(GLUmat4 *result, - GLfloat fovy, GLfloat aspect, GLfloat near, GLfloat far) +gluPerspective4f(GLUmat4 *result, + GLfloat fovy, GLfloat aspect, GLfloat near, GLfloat far) { const double sine = sin(DEG2RAD(fovy / 2.0)); const double cosine = cos(DEG2RAD(fovy / 2.0)); |