jyapayne/opengl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make the GLUT example compile on bigbreak

Browse source
This commit is contained in:
EXetoC 2014-10-04 12:37:44 +02:00
commit 6d89c7b1c1
2 changed files with 150 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/glu.nim
View file

@ -24,14 +24,14 @@ elif defined(macosx):
else: else:
const const
dllname = "libGLU.so.1" dllname = "libGLU.so.1"
type type
TViewPortArray* = array[0..3, TGLint] TViewPortArray* = array[0..3, TGLint]
T16dArray* = array[0..15, TGLdouble] T16dArray* = array[0..15, TGLdouble]
TCallBack* = proc () TCallBack* = proc ()
T3dArray* = array[0..2, TGLdouble] T3dArray* = array[0..2, TGLdouble]
T4pArray* = array[0..3, Pointer] T4pArray* = array[0..3, pointer]
T4fArray* = array[0..3, TGLfloat] T4fArray* = array[0..3, TGLfloat]
PPointer* = ptr Pointer
type type
GLUnurbs*{.final.} = object GLUnurbs*{.final.} = object
@ -80,14 +80,14 @@ proc gluUnProject*(winx, winy, winz: TGLdouble,
viewport: var TViewPortArray, objx, objy, objz: ptr TGLdouble): int{. viewport: var TViewPortArray, objx, objy, objz: ptr TGLdouble): int{.
dynlib: dllname, importc: "gluUnProject".} dynlib: dllname, importc: "gluUnProject".}
proc gluScaleImage*(format: TGLenum, widthin, heightin: TGLint, typein: TGLenum, proc gluScaleImage*(format: TGLenum, widthin, heightin: TGLint, typein: TGLenum,
datain: Pointer, widthout, heightout: TGLint, datain: pointer, widthout, heightout: TGLint,
typeout: TGLenum, dataout: Pointer): int{.dynlib: dllname, typeout: TGLenum, dataout: pointer): int{.dynlib: dllname,
importc: "gluScaleImage".} importc: "gluScaleImage".}
proc gluBuild1DMipmaps*(target: TGLenum, components, width: TGLint, proc gluBuild1DMipmaps*(target: TGLenum, components, width: TGLint,
format, atype: TGLenum, data: Pointer): int{. format, atype: TGLenum, data: pointer): int{.
dynlib: dllname, importc: "gluBuild1DMipmaps".} dynlib: dllname, importc: "gluBuild1DMipmaps".}
proc gluBuild2DMipmaps*(target: TGLenum, components, width, height: TGLint, proc gluBuild2DMipmaps*(target: TGLenum, components, width, height: TGLint,
format, atype: TGLenum, data: Pointer): int{. format, atype: TGLenum, data: pointer): int{.
dynlib: dllname, importc: "gluBuild2DMipmaps".} dynlib: dllname, importc: "gluBuild2DMipmaps".}
proc gluNewQuadric*(): PGLUquadric{.dynlib: dllname, importc: "gluNewQuadric".} proc gluNewQuadric*(): PGLUquadric{.dynlib: dllname, importc: "gluNewQuadric".}
proc gluDeleteQuadric*(state: PGLUquadric){.dynlib: dllname, proc gluDeleteQuadric*(state: PGLUquadric){.dynlib: dllname,
@ -115,11 +115,11 @@ proc gluQuadricCallback*(qobj: PGLUquadric, which: TGLenum, fn: TCallBack){.
proc gluNewTess*(): PGLUtesselator{.dynlib: dllname, importc: "gluNewTess".} proc gluNewTess*(): PGLUtesselator{.dynlib: dllname, importc: "gluNewTess".}
proc gluDeleteTess*(tess: PGLUtesselator){.dynlib: dllname, proc gluDeleteTess*(tess: PGLUtesselator){.dynlib: dllname,
importc: "gluDeleteTess".} importc: "gluDeleteTess".}
proc gluTessBeginPolygon*(tess: PGLUtesselator, polygon_data: Pointer){. proc gluTessBeginPolygon*(tess: PGLUtesselator, polygon_data: pointer){.
dynlib: dllname, importc: "gluTessBeginPolygon".} dynlib: dllname, importc: "gluTessBeginPolygon".}
proc gluTessBeginContour*(tess: PGLUtesselator){.dynlib: dllname, proc gluTessBeginContour*(tess: PGLUtesselator){.dynlib: dllname,
importc: "gluTessBeginContour".} importc: "gluTessBeginContour".}
proc gluTessVertex*(tess: PGLUtesselator, coords: var T3dArray, data: Pointer){. proc gluTessVertex*(tess: PGLUtesselator, coords: var T3dArray, data: pointer){.
dynlib: dllname, importc: "gluTessVertex".} dynlib: dllname, importc: "gluTessVertex".}
proc gluTessEndContour*(tess: PGLUtesselator){.dynlib: dllname, proc gluTessEndContour*(tess: PGLUtesselator){.dynlib: dllname,
importc: "gluTessEndContour".} importc: "gluTessEndContour".}
@ -170,20 +170,18 @@ type # gluQuadricCallback
GLUquadricErrorProc* = proc (p: TGLenum) # gluTessCallback GLUquadricErrorProc* = proc (p: TGLenum) # gluTessCallback
GLUtessBeginProc* = proc (p: TGLenum) GLUtessBeginProc* = proc (p: TGLenum)
GLUtessEdgeFlagProc* = proc (p: TGLboolean) GLUtessEdgeFlagProc* = proc (p: TGLboolean)
GLUtessVertexProc* = proc (p: Pointer) GLUtessVertexProc* = proc (p: pointer)
GLUtessEndProc* = proc () GLUtessEndProc* = proc ()
GLUtessErrorProc* = proc (p: TGLenum) GLUtessErrorProc* = proc (p: TGLenum)
GLUtessCombineProc* = proc (p1: var T3dArray, p2: T4pArray, p3: T4fArray, GLUtessCombineProc* = proc (p1: var T3dArray, p2: T4pArray, p3: T4fArray,
p4: PPointer) p4: ptr pointer)
GLUtessBeginDataProc* = proc (p1: TGLenum, p2: Pointer) GLUtessBeginDataProc* = proc (p1: TGLenum, p2: pointer)
GLUtessEdgeFlagDataProc* = proc (p1: TGLboolean, p2: Pointer) GLUtessEdgeFlagDataProc* = proc (p1: TGLboolean, p2: pointer)
GLUtessVertexDataProc* = proc (p1, p2: Pointer) GLUtessVertexDataProc* = proc (p1, p2: pointer)
GLUtessEndDataProc* = proc (p: Pointer) GLUtessEndDataProc* = proc (p: pointer)
GLUtessErrorDataProc* = proc (p1: TGLenum, p2: Pointer) GLUtessErrorDataProc* = proc (p1: TGLenum, p2: pointer)
GLUtessCombineDataProc* = proc (p1: var T3dArray, p2: var T4pArray, GLUtessCombineDataProc* = proc (p1: var T3dArray, p2: var T4pArray,
p3: var T4fArray, p4: PPointer, p5: Pointer) # p3: var T4fArray, p4: ptr pointer, p5: pointer) #
#
# gluNurbsCallback
GLUnurbsErrorProc* = proc (p: TGLenum) #*** Generic constants ****/ GLUnurbsErrorProc* = proc (p: TGLenum) #*** Generic constants ****/
const # Version const # Version

2
src/glut.nim
View file

@ -35,6 +35,8 @@ type
TGlut1Char2IntCallback* = proc (c: int8, v1, v2: cint){.cdecl.} TGlut1Char2IntCallback* = proc (c: int8, v1, v2: cint){.cdecl.}
TGlut1UInt3IntCallback* = proc (u, v1, v2, v3: cint){.cdecl.} TGlut1UInt3IntCallback* = proc (u, v1, v2, v3: cint){.cdecl.}
{.deprecated: [Pointer: pointer].}
const const
GLUT_API_VERSION* = 3 GLUT_API_VERSION* = 3
GLUT_XLIB_IMPLEMENTATION* = 12 # Display mode bit masks. GLUT_XLIB_IMPLEMENTATION* = 12 # Display mode bit masks.