diff --git a/src/osgWrappers/osg/TexMat.cpp b/src/osgWrappers/osg/TexMat.cpp index 9349f1c37..67ac6c5f6 100644 --- a/src/osgWrappers/osg/TexMat.cpp +++ b/src/osgWrappers/osg/TexMat.cpp @@ -27,6 +27,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexMat) I_BaseType(osg::StateAttribute); I_Constructor0(); + I_Constructor1(IN, const osg::Matrix &, matrix); I_ConstructorWithDefaults2(IN, const osg::TexMat &, texmat, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); I_Method0(osg::Object *, cloneType); I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp index 1c181bdf8..c1fb0cf86 100644 --- a/src/osgWrappers/osgUtil/Optimizer.cpp +++ b/src/osgWrappers/osgUtil/Optimizer.cpp @@ -59,6 +59,7 @@ BEGIN_ENUM_REFLECTOR(osgUtil::Optimizer::OptimizationOptions) I_EnumLabel(osgUtil::Optimizer::OPTIMIZE_TEXTURE_SETTINGS); I_EnumLabel(osgUtil::Optimizer::MERGE_GEODES); I_EnumLabel(osgUtil::Optimizer::FLATTEN_BILLBOARDS); + I_EnumLabel(osgUtil::Optimizer::TEXTURE_ATLAS_BUILDER); I_EnumLabel(osgUtil::Optimizer::DEFAULT_OPTIMIZATIONS); I_EnumLabel(osgUtil::Optimizer::ALL_OPTIMIZATIONS); END_REFLECTOR @@ -225,6 +226,7 @@ END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::TextureAtlasBuilder) I_Constructor0(); + I_Method0(void, reset); I_Method2(void, setMaximumAtlasSize, IN, unsigned int, width, IN, unsigned int, height); I_Method0(unsigned int, getMaximumAtlasWidth); I_Method0(unsigned int, getMaximumAtlasHeight); @@ -242,7 +244,7 @@ BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::TextureAtlasBuilder) I_Method1(osg::Image *, getImageAtlas, IN, const osg::Image *, image); I_Method1(osg::Texture2D *, getTextureAtlas, IN, const osg::Image *, image); I_Method1(osg::Matrix, getTextureMatrix, IN, const osg::Image *, image); - I_Method1(osg::Image *, getImageAtlas, IN, const osg::Texture2D *, image); + I_Method1(osg::Image *, getImageAtlas, IN, const osg::Texture2D *, textue); I_Method1(osg::Texture2D *, getTextureAtlas, IN, const osg::Texture2D *, texture); I_Method1(osg::Matrix, getTextureMatrix, IN, const osg::Texture2D *, texture); I_Property(unsigned int, Margin); @@ -251,6 +253,17 @@ BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::TextureAtlasBuilder) I_ArrayProperty_Custom(const osg::Texture2D *, Source, Sources, unsigned int, void); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureAtlasVisitor) + I_BaseType(osgUtil::BaseOptimizerVisitor); + I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0); + I_Method0(osgUtil::Optimizer::TextureAtlasBuilder &, getTextureAtlasBuilder); + I_Method0(void, reset); + I_Method1(void, apply, IN, osg::Node &, node); + I_Method1(void, apply, IN, osg::Geode &, geode); + I_Method0(void, optimize); + I_ReadOnlyProperty(osgUtil::Optimizer::TextureAtlasBuilder &, TextureAtlasBuilder); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults7(IN, bool, changeAutoUnRef, , IN, bool, valueAutoUnRef, , IN, bool, changeClientImageStorage, , IN, bool, valueClientImageStorage, , IN, bool, changeAnisotropy, , IN, float, valueAnisotropy, , IN, osgUtil::Optimizer *, optimizer, 0);