Moved enum to public scope and rebuilt wrappers to fix wrapper build error
This commit is contained in:
parent
7a2c403992
commit
f07d106366
@ -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;
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user