diff --git a/README.txt b/README.txt index 40b983a57..719dd79c4 100644 --- a/README.txt +++ b/README.txt @@ -10,7 +10,7 @@ For the impatient, read the simplified build notes below. Robert Osfield. Project Lead. -3rd September 2007. +13th September 2007. -- diff --git a/src/osgWrappers/osg/Texture2DArray.cpp b/src/osgWrappers/osg/Texture2DArray.cpp index ebb2b7c7b..eba9e2ac8 100644 --- a/src/osgWrappers/osg/Texture2DArray.cpp +++ b/src/osgWrappers/osg/Texture2DArray.cpp @@ -295,31 +295,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture2DArray::Extensions) __GLint__max2DSize, "", ""); - I_Method1(void, setTexImage3DProc, IN, void *, ptr, - Properties::NON_VIRTUAL, - __void__setTexImage3DProc__void_P1, - "", - ""); I_Method10(void, glTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels, Properties::NON_VIRTUAL, __void__glTexImage3D__GLenum__GLint__GLenum__GLsizei__GLsizei__GLsizei__GLint__GLenum__GLenum__C5_GLvoid_P1, "", ""); - I_Method1(void, setTexSubImage3DProc, IN, void *, ptr, - Properties::NON_VIRTUAL, - __void__setTexSubImage3DProc__void_P1, - "", - ""); I_Method11(void, glTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels, Properties::NON_VIRTUAL, __void__glTexSubImage3D__GLenum__GLint__GLint__GLint__GLint__GLsizei__GLsizei__GLsizei__GLenum__GLenum__C5_GLvoid_P1, "", ""); - I_Method1(void, setCopyTexSubImage3DProc, IN, void *, ptr, - Properties::NON_VIRTUAL, - __void__setCopyTexSubImage3DProc__void_P1, - "", - ""); I_Method9(void, glCopyTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLint, x, IN, GLint, y, IN, GLsizei, width, IN, GLsizei, height, Properties::NON_VIRTUAL, __void__glCopyTexSubImage3D__GLenum__GLint__GLint__GLint__GLint__GLint__GLint__GLsizei__GLsizei, @@ -330,11 +315,6 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture2DArray::Extensions) __bool__isCompressedTexImage3DSupported, "", ""); - I_Method1(void, setCompressedTexImage3DProc, IN, void *, ptr, - Properties::NON_VIRTUAL, - __void__setCompressedTexImage3DProc__void_P1, - "", - ""); I_Method9(void, glCompressedTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalformat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLsizei, imageSize, IN, const GLvoid *, data, Properties::NON_VIRTUAL, __void__glCompressedTexImage3D__GLenum__GLint__GLenum__GLsizei__GLsizei__GLsizei__GLint__GLsizei__C5_GLvoid_P1, @@ -345,37 +325,47 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture2DArray::Extensions) __bool__isCompressedTexSubImage3DSupported, "", ""); - I_Method1(void, setCompressedTexSubImage3DProc, IN, void *, ptr, - Properties::NON_VIRTUAL, - __void__setCompressedTexSubImage3DProc__void_P1, - "", - ""); I_Method11(void, glCompressedTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLsizei, imageSize, IN, const GLvoid *, data, Properties::NON_VIRTUAL, __void__glCompressedTexSubImage3D__GLenum__GLint__GLint__GLint__GLint__GLsizei__GLsizei__GLsizei__GLenum__GLsizei__C5_GLvoid_P1, "", ""); - I_SimpleProperty(void *, CompressedTexImage3DProc, - 0, - __void__setCompressedTexImage3DProc__void_P1); - I_SimpleProperty(void *, CompressedTexSubImage3DProc, - 0, - __void__setCompressedTexSubImage3DProc__void_P1); - I_SimpleProperty(void *, CopyTexSubImage3DProc, - 0, - __void__setCopyTexSubImage3DProc__void_P1); + I_ProtectedMethod1(typedef, void, IN, APIENTRY *, GLTexImage3DProc, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __typedef__void__APIENTRY_P1, + "", + ""); + I_ProtectedMethod1(typedef, void, IN, APIENTRY *, GLTexSubImage3DProc, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __typedef__void__APIENTRY_P1, + "", + ""); + I_ProtectedMethod1(typedef, void, IN, APIENTRY *, CompressedTexImage3DArbProc, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __typedef__void__APIENTRY_P1, + "", + ""); + I_ProtectedMethod1(typedef, void, IN, APIENTRY *, CompressedTexSubImage3DArbProc, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __typedef__void__APIENTRY_P1, + "", + ""); + I_ProtectedMethod1(typedef, void, IN, APIENTRY *, GLCopyTexSubImageProc, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __typedef__void__APIENTRY_P1, + "", + ""); I_SimpleProperty(GLint, Max2DSize, 0, __void__setMax2DSize__GLint); I_SimpleProperty(GLint, MaxLayerCount, 0, __void__setMaxLayerCount__GLint); - I_SimpleProperty(void *, TexImage3DProc, - 0, - __void__setTexImage3DProc__void_P1); - I_SimpleProperty(void *, TexSubImage3DProc, - 0, - __void__setTexSubImage3DProc__void_P1); I_SimpleProperty(bool, Texture2DArraySupported, 0, __void__setTexture2DArraySupported__bool);