From f07d106366658435f918d4eaa75fb864dfef80ae Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 29 May 2008 13:54:59 +0000 Subject: [PATCH] Moved enum to public scope and rebuilt wrappers to fix wrapper build error --- include/osg/Texture | 18 +++++++++--------- src/osgWrappers/osg/Texture.cpp | 11 +++++++++-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/include/osg/Texture b/include/osg/Texture index c9f10059b..026af6f8d 100644 --- a/include/osg/Texture +++ b/include/osg/Texture @@ -704,6 +704,15 @@ class OSG_EXPORT Texture : public osg::StateAttribute * 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; + /** Returned by mipmapBeforeTexImage() to indicate what + * mipmapAfterTexImage() should do */ + enum GenerateMipmapMode + { + GENERATE_MIPMAP_NONE, + GENERATE_MIPMAP, + GENERATE_MIPMAP_TEX_PARAMETER + }; + protected : virtual ~Texture(); @@ -723,15 +732,6 @@ class OSG_EXPORT Texture : public osg::StateAttribute * glGenerateMipmapEXT() or GL_GENERATE_MIPMAP_SGIS are supported. */ 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 * gl[Compressed][Copy]Tex[Sub]Image2D to handle generating mipmaps. */ GenerateMipmapMode mipmapBeforeTexImage(const State& state, bool hardwareMipmapOn) const; diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 2d0f3e5ca..c2d0fb0b3 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -94,6 +94,13 @@ BEGIN_ENUM_REFLECTOR(osg::Texture::ShadowTextureMode) I_EnumLabel(osg::Texture::ALPHA); 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) I_DeclaringFile("osg/Texture"); I_BaseType(osg::StateAttribute); @@ -519,13 +526,13 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) __bool__isHardwareMipmapGenerationEnabled__C5_State_R1, "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::CONST, __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. ", ""); - 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::CONST, __void__mipmapAfterTexImage__State_R1__GenerateMipmapMode,