diff --git a/gb.opengl/src/GL.c b/gb.opengl/src/GL.c index d5a32bde7..81310cb80 100644 --- a/gb.opengl/src/GL.c +++ b/gb.opengl/src/GL.c @@ -185,8 +185,8 @@ GB_DESC Cgl[] = /* Texture Mapping - see GLtextureMapping.h */ GB_STATIC_METHOD("BindTexture", NULL, GLBINDTEXTURE, "(Target)i(Texture)i"), // TODO adapt to gambas - //GB_STATIC_METHOD("CopyTexImage1D", NULL, GLCOPYTEXIMAGE1D, "(Target)i(Level)i(Format)i(X)i(Y)i(Width)i(Border)i"), - //GB_STATIC_METHOD("CopyTexImage2D", NULL, GLCOPYTEXIMAGE2D, "(Target)i(Level)i(Format)i(X)i(Y)i(Width)i(Height)i(Border)i"), + GB_STATIC_METHOD("CopyTexImage1D", NULL, GLCOPYTEXIMAGE1D, "(Target)i(Level)i(Format)i(X)i(Y)i(Width)i(Border)i"), + GB_STATIC_METHOD("CopyTexImage2D", NULL, GLCOPYTEXIMAGE2D, "(Target)i(Level)i(Format)i(X)i(Y)i(Width)i(Height)i(Border)i"), GB_STATIC_METHOD("DeleteTextures", NULL, GLDELETETEXTURES, "(Textures)Integer[]"), GB_STATIC_METHOD("GenTextures", "Integer[]", GLGENTEXTURES, "(Count)i"), GB_STATIC_METHOD("IsTexture", "b", GLISTEXTURE, "(Texture)i"), @@ -210,6 +210,8 @@ GB_DESC Cgl[] = GB_STATIC_METHOD("TexParameterfv", NULL, GLTEXPARAMETERFV, "(Target)i(Pname)i(Params)Float[]"), GB_STATIC_METHOD("TexParameteri", NULL, GLTEXPARAMETERI, "(Target)i(Pname)i(Param)i"), GB_STATIC_METHOD("TexParameteriv", NULL, GLTEXPARAMETERIV, "(Target)i(Pname)i(Params)Integer[]"), + GB_STATIC_METHOD("TexGeni", NULL, GLTEXGENI, "(Coord)i(Pname)i(Param)i"), + GB_STATIC_METHOD("MultiTexCoord2f", NULL, GLMULTITEXCOORD2F, "(Target)i(S)f(T)f"), /* FrameBuffer Operations - see GLframeBufferOps.h */ GB_STATIC_METHOD("Accum", NULL, GLACCUM, "(Operation)i(Value)f"), diff --git a/gb.opengl/src/GLtextureMapping.c b/gb.opengl/src/GLtextureMapping.c index 17b41b1d4..6da89f290 100644 --- a/gb.opengl/src/GLtextureMapping.c +++ b/gb.opengl/src/GLtextureMapping.c @@ -283,3 +283,15 @@ BEGIN_METHOD(GLTEXPARAMETERIV, GB_INTEGER Target; GB_INTEGER Pname; GB_OBJECT Pa glTexParameteriv(VARG(Target), VARG(Pname), params); END_METHOD + +BEGIN_METHOD(GLTEXGENI, GB_INTEGER Coord; GB_INTEGER Pname; GB_INTEGER Param) + + glTexGeni(VARG(Coord), VARG(Pname), VARG(Param)); + +END_METHOD + +BEGIN_METHOD(GLMULTITEXCOORD2F, GB_INTEGER Target; GB_FLOAT S; GB_FLOAT T) + + glMultiTexCoord2d (VARG(Target), VARG(S), VARG(T)); + +END_METHOD diff --git a/gb.opengl/src/GLtextureMapping.h b/gb.opengl/src/GLtextureMapping.h index f3459640f..e9422cd8d 100644 --- a/gb.opengl/src/GLtextureMapping.h +++ b/gb.opengl/src/GLtextureMapping.h @@ -50,5 +50,7 @@ DECLARE_METHOD(GLTEXPARAMETERF); DECLARE_METHOD(GLTEXPARAMETERFV); DECLARE_METHOD(GLTEXPARAMETERI); DECLARE_METHOD(GLTEXPARAMETERIV); +DECLARE_METHOD(GLTEXGENI); +DECLARE_METHOD(GLMULTITEXCOORD2F); #endif /* __GLTEXTUREMAPPING_H */