FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved enum to public scope and rebuilt wrappers to fix wrapper build error

Browse Source
This commit is contained in:
Robert Osfield 2008-05-29 13:54:59 +00:00
parent 7a2c403992
commit f07d106366
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/osg/Texture
View File

@ -704,6 +704,15 @@ class OSG_EXPORT Texture : public osg::StateAttribute
* unless you're implementing a subload callback. */ * unless you're implementing a subload callback. */
void applyTexImage2D_subload(State& state, GLenum target, const Image* image, GLsizei width, GLsizei height, GLint inInternalFormat, GLsizei numMipmapLevels) const; void applyTexImage2D_subload(State& state, GLenum target, const Image* image, GLsizei width, GLsizei height, GLint inInternalFormat, GLsizei numMipmapLevels) const;
/** Returned by mipmapBeforeTexImage() to indicate what
* mipmapAfterTexImage() should do */
enum GenerateMipmapMode
{
GENERATE_MIPMAP_NONE,
GENERATE_MIPMAP,
GENERATE_MIPMAP_TEX_PARAMETER
};
protected : protected :
virtual ~Texture(); virtual ~Texture();
@ -723,15 +732,6 @@ class OSG_EXPORT Texture : public osg::StateAttribute
* glGenerateMipmapEXT() or GL_GENERATE_MIPMAP_SGIS are supported. */ * glGenerateMipmapEXT() or GL_GENERATE_MIPMAP_SGIS are supported. */
bool isHardwareMipmapGenerationEnabled(const State& state) const; bool isHardwareMipmapGenerationEnabled(const State& state) const;
/** Returned by mipmapBeforeTexImage() to indicate what
* mipmapAfterTexImage() should do */
enum GenerateMipmapMode
{
GENERATE_MIPMAP_NONE,
GENERATE_MIPMAP,
GENERATE_MIPMAP_TEX_PARAMETER
};
/** Helper methods to be called before and after calling /** Helper methods to be called before and after calling
* gl[Compressed][Copy]Tex[Sub]Image2D to handle generating mipmaps. */ * gl[Compressed][Copy]Tex[Sub]Image2D to handle generating mipmaps. */
GenerateMipmapMode mipmapBeforeTexImage(const State& state, bool hardwareMipmapOn) const; GenerateMipmapMode mipmapBeforeTexImage(const State& state, bool hardwareMipmapOn) const;

11
src/osgWrappers/osg/Texture.cpp
View File

@ -94,6 +94,13 @@ BEGIN_ENUM_REFLECTOR(osg::Texture::ShadowTextureMode)
I_EnumLabel(osg::Texture::ALPHA); I_EnumLabel(osg::Texture::ALPHA);
END_REFLECTOR END_REFLECTOR
BEGIN_ENUM_REFLECTOR(osg::Texture::GenerateMipmapMode)
I_DeclaringFile("osg/Texture");
I_EnumLabel(osg::Texture::GENERATE_MIPMAP_NONE);
I_EnumLabel(osg::Texture::GENERATE_MIPMAP);
I_EnumLabel(osg::Texture::GENERATE_MIPMAP_TEX_PARAMETER);
END_REFLECTOR
BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture)
I_DeclaringFile("osg/Texture"); I_DeclaringFile("osg/Texture");
I_BaseType(osg::StateAttribute); I_BaseType(osg::StateAttribute);
@ -519,13 +526,13 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture)
__bool__isHardwareMipmapGenerationEnabled__C5_State_R1, __bool__isHardwareMipmapGenerationEnabled__C5_State_R1,
"Returns true if _useHardwareMipMapGeneration is true and either glGenerateMipmapEXT() or GL_GENERATE_MIPMAP_SGIS are supported. ", "Returns true if _useHardwareMipMapGeneration is true and either glGenerateMipmapEXT() or GL_GENERATE_MIPMAP_SGIS are supported. ",
""); "");
I_ProtectedMethod2(GenerateMipmapMode, mipmapBeforeTexImage, IN, const osg::State &, state, IN, bool, hardwareMipmapOn, I_ProtectedMethod2(osg::Texture::GenerateMipmapMode, mipmapBeforeTexImage, IN, const osg::State &, state, IN, bool, hardwareMipmapOn,
Properties::NON_VIRTUAL, Properties::NON_VIRTUAL,
Properties::CONST, Properties::CONST,
__GenerateMipmapMode__mipmapBeforeTexImage__C5_State_R1__bool, __GenerateMipmapMode__mipmapBeforeTexImage__C5_State_R1__bool,
"Helper methods to be called before and after calling gl[Compressed][Copy]Tex[Sub]Image2D to handle generating mipmaps. ", "Helper methods to be called before and after calling gl[Compressed][Copy]Tex[Sub]Image2D to handle generating mipmaps. ",
""); "");
I_ProtectedMethod2(void, mipmapAfterTexImage, IN, osg::State &, state, IN, GenerateMipmapMode, beforeResult, I_ProtectedMethod2(void, mipmapAfterTexImage, IN, osg::State &, state, IN, osg::Texture::GenerateMipmapMode, beforeResult,
Properties::NON_VIRTUAL, Properties::NON_VIRTUAL,
Properties::CONST, Properties::CONST,
__void__mipmapAfterTexImage__State_R1__GenerateMipmapMode, __void__mipmapAfterTexImage__State_R1__GenerateMipmapMode,