luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.SDL]

Browse source 
BUG: Add missing Gl.PolygonOffset method.


git-svn-id: svn://localhost/gambas/trunk@4231 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Laurent Carlier 2011-11-02 21:45:13 +00:00
parent 099fda7cd2
commit f0ecead64d
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gb.opengl/src/GL.c
View file

@ -217,6 +217,7 @@ GB_DESC Cgl[] =
GB_STATIC_METHOD("LineWidth", NULL, GLLINEWIDTH, "(Width)f"), GB_STATIC_METHOD("LineWidth", NULL, GLLINEWIDTH, "(Width)f"),
GB_STATIC_METHOD("PointSize", NULL, GLPOINTSIZE, "(Size)f"), GB_STATIC_METHOD("PointSize", NULL, GLPOINTSIZE, "(Size)f"),
GB_STATIC_METHOD("PolygonMode", NULL, GLPOLYGONMODE, "(Face)i(Mode)i"), GB_STATIC_METHOD("PolygonMode", NULL, GLPOLYGONMODE, "(Face)i(Mode)i"),
GB_STATIC_METHOD("PolygonOffset", NULL, GLPOLYGONOFFSET, "(Factor)f(Units)f"),
//GB_STATIC_METHOD("PolygonStipple", NULL, GLPOLYGONSTIPPLE, "(Mask)i"), //TODO //GB_STATIC_METHOD("PolygonStipple", NULL, GLPOLYGONSTIPPLE, "(Mask)i"), //TODO
GB_STATIC_METHOD("RasterPos2f", NULL, GLRASTERPOS2F, "(X)f(Y)f"), GB_STATIC_METHOD("RasterPos2f", NULL, GLRASTERPOS2F, "(X)f(Y)f"),
GB_STATIC_METHOD("RasterPos3f", NULL, GLRASTERPOS3F, "(X)f(Y)f(Z)f"), GB_STATIC_METHOD("RasterPos3f", NULL, GLRASTERPOS3F, "(X)f(Y)f(Z)f"),
@ -476,14 +477,11 @@ GB_DESC Cgl[] =
GB_CONSTANT("CULL_FACE", "i", GL_CULL_FACE), GB_CONSTANT("CULL_FACE", "i", GL_CULL_FACE),
GB_CONSTANT("CULL_FACE_MODE", "i", GL_CULL_FACE_MODE), GB_CONSTANT("CULL_FACE_MODE", "i", GL_CULL_FACE_MODE),
GB_CONSTANT("FRONT_FACE", "i", GL_FRONT_FACE), GB_CONSTANT("FRONT_FACE", "i", GL_FRONT_FACE),
#if 0
// ogl 1.1 : void glPolygonOffset( GLfloat factor,GLfloat units )
GB_CONSTANT("POLYGON_OFFSET_FACTOR", "i", GL_POLYGON_OFFSET_FACTOR), GB_CONSTANT("POLYGON_OFFSET_FACTOR", "i", GL_POLYGON_OFFSET_FACTOR),
GB_CONSTANT("POLYGON_OFFSET_UNITS", "i", GL_POLYGON_OFFSET_UNITS), GB_CONSTANT("POLYGON_OFFSET_UNITS", "i", GL_POLYGON_OFFSET_UNITS),
GB_CONSTANT("POLYGON_OFFSET_POINT", "i", GL_POLYGON_OFFSET_POINT), GB_CONSTANT("POLYGON_OFFSET_POINT", "i", GL_POLYGON_OFFSET_POINT),
GB_CONSTANT("POLYGON_OFFSET_LINE", "i", GL_POLYGON_OFFSET_LINE), GB_CONSTANT("POLYGON_OFFSET_LINE", "i", GL_POLYGON_OFFSET_LINE),
GB_CONSTANT("POLYGON_OFFSET_FILL", "i", GL_POLYGON_OFFSET_FILL), GB_CONSTANT("POLYGON_OFFSET_FILL", "i", GL_POLYGON_OFFSET_FILL),
#endif
/* Depth buffer */ /* Depth buffer */
GB_CONSTANT("NEVER", "i", GL_NEVER), GB_CONSTANT("NEVER", "i", GL_NEVER),

6
gb.opengl/src/GLrasterization.c
View file

@ -83,6 +83,12 @@ BEGIN_METHOD(GLPOLYGONSTIPPLE, GB_INTEGER mask)
END_METHOD END_METHOD
#endif #endif
BEGIN_METHOD(GLPOLYGONOFFSET, GB_FLOAT factor; GB_FLOAT units)
glPolygonOffset(VARG(factor), VARG(units));
END_METHOD
BEGIN_METHOD(GLRASTERPOS2F, GB_FLOAT x; GB_FLOAT y) BEGIN_METHOD(GLRASTERPOS2F, GB_FLOAT x; GB_FLOAT y)
glRasterPos2d(VARG(x), VARG(y)); glRasterPos2d(VARG(x), VARG(y));

2
gb.opengl/src/GLrasterization.h
View file

@ -36,7 +36,7 @@ DECLARE_METHOD(GLLINESTIPPLE);
DECLARE_METHOD(GLLINEWIDTH); DECLARE_METHOD(GLLINEWIDTH);
DECLARE_METHOD(GLPOINTSIZE); DECLARE_METHOD(GLPOINTSIZE);
DECLARE_METHOD(GLPOLYGONMODE); DECLARE_METHOD(GLPOLYGONMODE);
DECLARE_METHOD(GLPOLYGONSTIPPLE); DECLARE_METHOD(GLPOLYGONOFFSET);
DECLARE_METHOD(GLRASTERPOS2F); DECLARE_METHOD(GLRASTERPOS2F);
DECLARE_METHOD(GLRASTERPOS3F); DECLARE_METHOD(GLRASTERPOS3F);
DECLARE_METHOD(GLRASTERPOSF); DECLARE_METHOD(GLRASTERPOSF);