Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2012-11-26 07:33:32 +0000
committerEvan Goers <mega@osirion.org>2012-11-26 07:33:32 +0000
commit7a5b8cc4b9f7343db13491941088c95c96833c18 (patch)
tree6d9c5e879c3ae1bc1b66ca1559e36d01f5c10826 /src/render/gl.h
parenta3a57df0be5c9d1d4ebbd153cabadbca48d16e79 (diff)
More gl::-ization.
Diffstat (limited to 'src/render/gl.h')
-rw-r--r--src/render/gl.h23
1 files changed, 18 insertions, 5 deletions
diff --git a/src/render/gl.h b/src/render/gl.h
index 8d8e48e..2d19a45 100644
--- a/src/render/gl.h
+++ b/src/render/gl.h
@@ -122,6 +122,9 @@ void enableclientstate(GLenum cap);
/// glDisableClientState
void disableclientstate(GLenum cap);
+/// glGetIntegerv
+void getinteger(GLenum pname, GLint* params);
+
/// glShadeModel
void shademodel(GLenum mode);
@@ -163,13 +166,11 @@ void end();
* line, and polygon vertices. The current color, normal, and texture
* coordinates are associated with the vertex when vertex() is called.
*/
-void vertex(const math::Vector3f& vector);
-
-void vertex(const float x, const float y, const float z);
-
void vertex(const math::Vector2f& vector);
-
void vertex(const float x, const float y);
+void vertex(const math::Vector3f& vector);
+void vertex(const float x, const float y, const float z);
+void vertex(const GLfloat* v);
/// glTexCoord
void texcoord(const float x, const float y);
@@ -268,6 +269,12 @@ void loadidentity();
/// Perspective matrix
void frustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble znear, GLdouble zfar);
+/// Light source parameters
+void light(GLenum light, GLenum pname, GLfloat param);
+void light(GLenum light, GLenum pname, GLint param);
+void light(GLenum light, GLenum pname, const GLfloat* params);
+void light(GLenum light, GLenum pname, const GLint* params);
+
/// Light model
void lightmodel(GLenum pname, GLfloat param);
void lightmodel(GLenum pname, GLint param);
@@ -300,6 +307,12 @@ void texgen(GLenum coord, GLenum param, const GLint* value);
void texgen(GLenum coord, GLenum param, const GLfloat* value);
void texgen(GLenum coord, GLenum param, const GLdouble* value);
+/// Texture parameters
+void texparameter(GLenum target, GLenum pname, GLfloat param);
+void texparameter(GLenum target, GLenum pname, GLint param);
+void texparameter(GLenum target, GLenum pname, const GLfloat* params);
+void texparameter(GLenum target, GLenum pname, const GLint* params);
+
/// Active server-side texture
void activetexture(GLenum texture);
/// Active client-side texture