Changeset 303 for trunk/DerelictGLU

Show
Ignore:
Timestamp:
06/06/08 06:19:35 (3 months ago)
Author:
aldacron
Message:

[DerelictAL]
* removed some commented out code
[DerelictGL]
* typos and formatting issues in bindable_uniform.d
[DerelictGL/GLU/IL/ILU/ILUT]
* replaced CTFE mixin hack for function typedef declarations with extern(System)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictGLU/derelict/opengl/glu.d

    r300 r303  
    296296typedef GLUtesselator GLUtriangulatorObj; 
    297297 
    298 version(Windows) 
    299 { 
    300     extern(Windows) typedef void function() _GLUfuncptr; 
    301 } 
    302 else 
    303 { 
    304     extern(C) typedef void function() _GLUfuncptr; 
    305 } 
     298extern(System) typedef void function() _GLUfuncptr; 
     299 
    306300//============================================================================== 
    307301// DLL FUNCTIONS 
    308302//============================================================================== 
    309 private const char[] Funcs = 
    310 " 
    311     typedef GLint function(GLenum,GLint,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild1DMipmapLevels; 
    312     typedef GLint function(GLenum,GLint,GLsizei,GLenum,GLenum,void*) pfgluBuild1DMipmaps; 
    313     typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild2DMipmapLevels; 
    314     typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLenum,GLenum,void*) pfgluBuild2DMipmaps; 
    315     typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild3DMipmapLevels; 
    316     typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,void*) pfgluBuild3DMipmaps; 
    317     typedef GLboolean function(GLubyte*,GLubyte*) pfgluCheckExtension; 
    318     typedef GLubyte* function(GLenum) pfgluErrorString; 
    319     typedef GLubyte* function(GLenum) pfgluGetString; 
    320     typedef void function(GLUquadric*,GLdouble,GLdouble,GLdouble,GLint,GLint) pfgluCylinder; 
    321     typedef void function(GLUquadric*,GLdouble,GLdouble,GLint,GLint) pfgluDisk; 
    322     typedef void function(GLUquadric*,GLdouble,GLdouble,GLint,GLint,GLdouble,GLdouble) pfgluPartialDisk; 
    323     typedef void function(GLUquadric*,GLdouble,GLint,GLint) pfgluSphere; 
    324     typedef void function(GLUnurbs*) pfgluBeginCurve; 
    325     typedef void function(GLUtesselator*) pfgluBeginPolygon; 
    326     typedef void function(GLUnurbs*) pfgluBeginSurface; 
    327     typedef void function(GLUnurbs*) pfgluBeginTrim; 
    328     typedef void function(GLUnurbs*) pfgluEndCurve; 
    329     typedef void function(GLUtesselator*) pfgluEndPolygon; 
    330     typedef void function(GLUnurbs*) pfgluEndSurface; 
    331     typedef void function(GLUnurbs*) pfgluEndTrim; 
    332     typedef void function(GLUnurbs*) pfgluDeleteNurbsRenderer; 
    333     typedef void function(GLUquadric*) pfgluDeleteQuadric; 
    334     typedef void function(GLUtesselator*) pfgluDeleteTess; 
    335     typedef void function(GLUnurbs*,GLenum,GLfloat*) pfgluGetNurbsProperty; 
    336     typedef void function(GLUtesselator*,GLenum,GLdouble*) pfgluGetTessProperty; 
    337     typedef void function(GLUnurbs*,GLfloat*,GLfloat*,GLint*) pfgluLoadSamplingMatrices; 
    338     typedef GLUnurbs* function() pfgluNewNurbsRenderer; 
    339     typedef GLUquadric* function() pfgluNewQuadric; 
    340     typedef GLUtesselator* function() pfgluNewTess; 
    341     typedef void function(GLUtesselator*,GLenum) pfgluNextContour; 
    342     typedef void function(GLUnurbs*,GLenum,_GLUfuncptr) pfgluNurbsCallback; 
    343     typedef void function(GLUnurbs*,GLvoid*) pfgluNurbsCallbackData; 
    344     typedef void function(GLUnurbs*,GLvoid*) pfgluNurbsCallbackDataEXT; 
    345     typedef void function(GLUnurbs*,GLint,GLfloat*,GLint,GLfloat*,GLint,GLenum) pfgluNurbsCurve; 
    346     typedef void function(GLUnurbs*,GLenum,GLfloat) pfgluNurbsProperty; 
    347     typedef void function(GLUnurbs*,GLint,GLfloat*,GLint,GLfloat*,GLint,GLint,GLfloat*,GLint,GLint,GLenum) pfgluNurbsSurface; 
    348     typedef void function(GLUnurbs*,GLint,GLfloat*,GLint,GLenum) pfgluPwlCurve; 
    349     typedef void function(GLUquadric*,GLenum,_GLUfuncptr) pfgluQuadricCallback; 
    350     typedef void function(GLUquadric*,GLenum) pfgluQuadricDrawStyle; 
    351     typedef void function(GLUquadric*,GLenum) pfgluQuadricNormals; 
    352     typedef void function(GLUquadric*,GLenum) pfgluQuadricOrientation; 
    353     typedef void function(GLUquadric*,GLboolean) pfgluQuadricTexture; 
    354     typedef void function(GLUtesselator*) pfgluTessBeginContour; 
    355     typedef void function(GLUtesselator*,GLvoid*) pfgluTessBeginPolygon; 
    356     typedef void function(GLUtesselator*,GLenum,_GLUfuncptr) pfgluTessCallback; 
    357     typedef void function(GLUtesselator*) pfgluTessEndContour; 
    358     typedef void function(GLUtesselator*) pfgluTessEndPolygon; 
    359     typedef void function(GLUtesselator*,GLdouble,GLdouble,GLdouble) pfgluTessNormal; 
    360     typedef void function(GLUtesselator*,GLenum,GLdouble) pfgluTessProperty; 
    361     typedef void function(GLUtesselator*,GLdouble*,GLvoid*) pfgluTessVertex; 
    362     typedef void function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble) pfgluLookAt; 
    363     typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfgluOrtho2D; 
    364     typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfgluPerspective; 
    365     typedef void function(GLdouble,GLdouble,GLdouble,GLdouble,GLint*) pfgluPickMatrix; 
    366     typedef GLint function(GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble*,GLdouble*,GLdouble*) pfgluProject; 
    367     typedef GLint function(GLenum,GLsizei,GLsizei,GLenum,void*,GLsizei,GLsizei,GLenum,GLvoid*) pfgluScaleImage; 
    368     typedef GLint function(GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble*,GLdouble*,GLdouble*) pfgluUnProject; 
    369     typedef GLint function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble,GLdouble,GLdouble*,GLdouble*,GLdouble*,GLdouble*) pfgluUnProject4; 
    370 "; 
    371  
    372 version(Windows) 
    373 { 
    374     extern(Windows): mixin(Funcs); 
    375 } 
    376 else 
    377 { 
    378     extern(C): mixin(Funcs); 
    379 } 
     303extern(System): 
     304 
     305typedef GLint function(GLenum,GLint,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild1DMipmapLevels; 
     306typedef GLint function(GLenum,GLint,GLsizei,GLenum,GLenum,void*) pfgluBuild1DMipmaps; 
     307typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild2DMipmapLevels; 
     308typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLenum,GLenum,void*) pfgluBuild2DMipmaps; 
     309typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,GLint,GLint,GLint,void*) pfgluBuild3DMipmapLevels; 
     310typedef GLint function(GLenum,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,void*) pfgluBuild3DMipmaps; 
     311typedef GLboolean function(GLubyte*,GLubyte*) pfgluCheckExtension; 
     312typedef GLubyte* function(GLenum) pfgluErrorString; 
     313typedef GLubyte* function(GLenum) pfgluGetString; 
     314typedef void function(GLUquadric*,GLdouble,GLdouble,GLdouble,GLint,GLint) pfgluCylinder; 
     315typedef void function(GLUquadric*,GLdouble,GLdouble,GLint,GLint) pfgluDisk; 
     316typedef void function(GLUquadric*,GLdouble,GLdouble,GLint,GLint,GLdouble,GLdouble) pfgluPartialDisk; 
     317typedef void function(GLUquadric*,GLdouble,GLint,GLint) pfgluSphere; 
     318typedef void function(GLUnurbs*) pfgluBeginCurve; 
     319typedef void function(GLUtesselator*) pfgluBeginPolygon; 
     320typedef void function(GLUnurbs*) pfgluBeginSurface; 
     321typedef void function(GLUnurbs*) pfgluBeginTrim; 
     322typedef void function(GLUnurbs*) pfgluEndCurve; 
     323typedef void function(GLUtesselator*) pfgluEndPolygon; 
     324typedef void function(GLUnurbs*) pfgluEndSurface; 
     325typedef void function(GLUnurbs*) pfgluEndTrim; 
     326typedef void function(GLUnurbs*) pfgluDeleteNurbsRenderer; 
     327typedef void function(GLUquadric*) pfgluDeleteQuadric; 
     328typedef void function(GLUtesselator*) pfgluDeleteTess; 
     329typedef void function(GLUnurbs*,GLenum,GLfloat*) pfgluGetNurbsProperty; 
     330typedef void function(GLUtesselator*,GLenum,GLdouble*) pfgluGetTessProperty; 
     331typedef void function(GLUnurbs*,GLfloat*,GLfloat*,GLint*) pfgluLoadSamplingMatrices; 
     332typedef GLUnurbs* function() pfgluNewNurbsRenderer; 
     333typedef GLUquadric* function() pfgluNewQuadric; 
     334typedef GLUtesselator* function() pfgluNewTess; 
     335typedef void function(GLUtesselator*,GLenum) pfgluNextContour; 
     336typedef void function(GLUnurbs*,GLenum,_GLUfuncptr) pfgluNurbsCallback; 
     337typedef void function(GLUnurbs*,GLvoid*) pfgluNurbsCallbackData; 
     338typedef void function(GLUnurbs*,GLvoid*) pfgluNurbsCallbackDataEXT; 
     339typedef void function(GLUnurbs*,GLint,GLfloat*,GLint,GLfloat*,GLint,GLenum) pfgluNurbsCurve; 
     340typedef void function(GLUnurbs*,GLenum,GLfloat) pfgluNurbsProperty; 
     341typedef void function(GLUnurbs*,GLint,GLfloat*,GLint,GLfloat*,GLint,GLint,GLfloat*,GLint,GLint,GLenum) pfgluNurbsSurface; 
     342typedef void function(GLUnurbs*,GLint,GLfloat*,GLint,GLenum) pfgluPwlCurve; 
     343typedef void function(GLUquadric*,GLenum,_GLUfuncptr) pfgluQuadricCallback; 
     344typedef void function(GLUquadric*,GLenum) pfgluQuadricDrawStyle; 
     345typedef void function(GLUquadric*,GLenum) pfgluQuadricNormals; 
     346typedef void function(GLUquadric*,GLenum) pfgluQuadricOrientation; 
     347typedef void function(GLUquadric*,GLboolean) pfgluQuadricTexture; 
     348typedef void function(GLUtesselator*) pfgluTessBeginContour; 
     349typedef void function(GLUtesselator*,GLvoid*) pfgluTessBeginPolygon; 
     350typedef void function(GLUtesselator*,GLenum,_GLUfuncptr) pfgluTessCallback; 
     351typedef void function(GLUtesselator*) pfgluTessEndContour; 
     352typedef void function(GLUtesselator*) pfgluTessEndPolygon; 
     353typedef void function(GLUtesselator*,GLdouble,GLdouble,GLdouble) pfgluTessNormal; 
     354typedef void function(GLUtesselator*,GLenum,GLdouble) pfgluTessProperty; 
     355typedef void function(GLUtesselator*,GLdouble*,GLvoid*) pfgluTessVertex; 
     356typedef void function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble) pfgluLookAt; 
     357typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfgluOrtho2D; 
     358typedef void function(GLdouble,GLdouble,GLdouble,GLdouble) pfgluPerspective; 
     359typedef void function(GLdouble,GLdouble,GLdouble,GLdouble,GLint*) pfgluPickMatrix; 
     360typedef GLint function(GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble*,GLdouble*,GLdouble*) pfgluProject; 
     361typedef GLint function(GLenum,GLsizei,GLsizei,GLenum,void*,GLsizei,GLsizei,GLenum,GLvoid*) pfgluScaleImage; 
     362typedef GLint function(GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble*,GLdouble*,GLdouble*) pfgluUnProject; 
     363typedef GLint function(GLdouble,GLdouble,GLdouble,GLdouble,GLdouble*,GLdouble*,GLint*,GLdouble,GLdouble,GLdouble*,GLdouble*,GLdouble*,GLdouble*) pfgluUnProject4; 
    380364 
    381365//pfgluBuild1DMipmapLevels  gluBuild1DMipmapLevels;