mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-18 21:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #561 from fenekku/master

Browse Source 
glColor*v now accept vector (array) as input (as in original lib)
This commit is contained in:
Araq
2013-09-11 13:27:37 -07:00
parent 1e2ec3642d 0ce885e8c8
commit 823cb494a5
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/wrappers/opengl/opengl.nim
View File

@@ -592,16 +592,24 @@ type # Datatypes corresponding to GL's types TGL(name)(
TGLVectorf2* = array[0..1, GLfloat]
TGLVectord2* = array[0..1, GLdouble]
TGLVectorp2* = array[0..1, Pointer]
TGLVectorb3* = array[0..2, GLbyte]
TGLVectorub3* = array[0..2, GLubyte]
TGLVectori3* = array[0..2, GLint]
TGLVectorui3* = array[0..2, GLuint]
TGLVectorf3* = array[0..2, GLfloat]
TGLVectord3* = array[0..2, GLdouble]
TGLVectorp3* = array[0..2, Pointer]
TGLVectors3* = array[0..2, GLshort]
TGLVectorus3* = array[0..2, GLushort]
TGLVectorb4* = array[0..3, GLbyte]
TGLVectorub4* = array[0..3, GLubyte]
TGLVectori4* = array[0..3, GLint]
TGLVectorui4* = array[0..3, GLuint]
TGLVectorf4* = array[0..3, GLfloat]
TGLVectord4* = array[0..3, GLdouble]
TGLVectorp4* = array[0..3, Pointer]
TGLVectors4* = array[0..3, GLshort]
TGLVectorus4* = array[0..3, GLshort]
TGLArrayf4* = TGLVectorf4
TGLArrayf3* = TGLVectorf3
TGLArrayd3* = TGLVectord3
@@ -5304,40 +5312,55 @@ proc glClearIndex*(c: GLfloat){.stdcall, importc, ogl.}
proc glClipPlane*(plane: GLenum, equation: PGLdouble){.stdcall, importc, ogl.}
proc glColor3b*(red: GLbyte, green: GLbyte, blue: GLbyte){.stdcall, importc, ogl.}
proc glColor3bv*(v: PGLbyte){.stdcall, importc, ogl.}
proc glColor3bv*(v: TGLVectorb3){.stdcall, importc, ogl.}
proc glColor3d*(red: GLdouble, green: GLdouble, blue: GLdouble){.stdcall, importc, ogl.}
proc glColor3dv*(v: PGLdouble){.stdcall, importc, ogl.}
proc glColor3dv*(v: TGLVectord3){.stdcall, importc, ogl.}
proc glColor3f*(red: GLfloat, green: GLfloat, blue: GLfloat){.stdcall, importc, ogl.}
proc glColor3fv*(v: PGLfloat){.stdcall, importc, ogl.}
proc glColor3fv*(v: TGLVectorf3){.stdcall, importc, ogl.}
proc glColor3i*(red: GLint, green: GLint, blue: GLint){.stdcall, importc, ogl.}
proc glColor3iv*(v: PGLint){.stdcall, importc, ogl.}
proc glColor3iv*(v: TGLVectori3){.stdcall, importc, ogl.}
proc glColor3s*(red: GLshort, green: GLshort, blue: GLshort){.stdcall, importc, ogl.}
proc glColor3sv*(v: PGLshort){.stdcall, importc, ogl.}
proc glColor3sv*(v: TGLVectors3){.stdcall, importc, ogl.}
proc glColor3ub*(red: GLubyte, green: GLubyte, blue: GLubyte){.stdcall, importc, ogl.}
proc glColor3ubv*(v: PGLubyte){.stdcall, importc, ogl.}
proc glColor3ubv*(v: TGLVectorub3){.stdcall, importc, ogl.}
proc glColor3ui*(red: GLuint, green: GLuint, blue: GLuint){.stdcall, importc, ogl.}
proc glColor3uiv*(v: PGLuint){.stdcall, importc, ogl.}
proc glColor3uiv*(v: TGLVectorui3){.stdcall, importc, ogl.}
proc glColor3us*(red: GLushort, green: GLushort, blue: GLushort){.stdcall, importc, ogl.}
proc glColor3usv*(v: PGLushort){.stdcall, importc, ogl.}
proc glColor3usv*(v: TGLVectorus3){.stdcall, importc, ogl.}
proc glColor4b*(red: GLbyte, green: GLbyte, blue: GLbyte, alpha: GLbyte){.
stdcall, importc, ogl.}
proc glColor4bv*(v: PGLbyte){.stdcall, importc, ogl.}
proc glColor4bv*(v: TGLVectorb4){.stdcall, importc, ogl.}
proc glColor4d*(red: GLdouble, green: GLdouble, blue: GLdouble, alpha: GLdouble){.
stdcall, importc, ogl.}
proc glColor4dv*(v: PGLdouble){.stdcall, importc, ogl.}
proc glColor4dv*(v: TGLVectord4){.stdcall, importc, ogl.}
proc glColor4f*(red: GLfloat, green: GLfloat, blue: GLfloat, alpha: GLfloat){.
stdcall, importc, ogl.}
proc glColor4fv*(v: PGLfloat){.stdcall, importc, ogl.}
proc glColor4fv*(v: TGLVectorf4){.stdcall, importc, ogl.}
proc glColor4i*(red: GLint, green: GLint, blue: GLint, alpha: GLint){.stdcall, importc, ogl.}
proc glColor4iv*(v: PGLint){.stdcall, importc, ogl.}
proc glColor4iv*(v: TGLVectori4){.stdcall, importc, ogl.}
proc glColor4s*(red: GLshort, green: GLshort, blue: GLshort, alpha: GLshort){.
stdcall, importc, ogl.}
proc glColor4sv*(v: PGLshort){.stdcall, importc, ogl.}
proc glColor4sv*(v: TGLVectors4){.stdcall, importc, ogl.}
proc glColor4ub*(red: GLubyte, green: GLubyte, blue: GLubyte, alpha: GLubyte){.
stdcall, importc, ogl.}
proc glColor4ubv*(v: PGLubyte){.stdcall, importc, ogl.}
proc glColor4ubv*(v: TGLVectorub4){.stdcall, importc, ogl.}
proc glColor4ui*(red: GLuint, green: GLuint, blue: GLuint, alpha: GLuint){.
stdcall, importc, ogl.}
proc glColor4uiv*(v: PGLuint){.stdcall, importc, ogl.}
proc glColor4uiv*(v: TGLVectorui4){.stdcall, importc, ogl.}
proc glColor4us*(red: GLushort, green: GLushort, blue: GLushort, alpha: GLushort){.
stdcall, importc, ogl.}
proc glColor4usv*(v: PGLushort){.stdcall, importc, ogl.}