diff --git a/src/osgWrappers/osgText/Font.cpp b/src/osgWrappers/osgText/Font.cpp index c2813cdaa..7d134a81f 100644 --- a/src/osgWrappers/osgText/Font.cpp +++ b/src/osgWrappers/osgText/Font.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,9 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font) I_Method0(const char *, className); I_Method0(const char *, libraryName); I_Method0(std::string, getFileName); + I_Method1(void, setTexEnv, IN, osg::TexEnv *, texenv); + I_Method0(osg::TexEnv *, getTexEnv); + I_Method0(const osg::TexEnv *, getTexEnv); I_Method1(void, setStateSet, IN, osg::StateSet *, stateset); I_Method0(osg::StateSet *, getStateSet); I_Method0(const osg::StateSet *, getStateSet); @@ -65,6 +69,7 @@ BEGIN_OBJECT_REFLECTOR(osgText::Font) I_Property(osg::Texture::FilterMode, MagFilterHint); I_Property(osg::Texture::FilterMode, MinFilterHint); I_Property(osg::StateSet *, StateSet); + I_Property(osg::TexEnv *, TexEnv); I_ReadOnlyProperty(unsigned int, TextureHeightHint); I_ReadOnlyProperty(unsigned int, TextureWidthHint); END_REFLECTOR diff --git a/src/osgWrappers/osgUtil/Statistics.cpp b/src/osgWrappers/osgUtil/Statistics.cpp index 23f83ed0c..a0e0e3bca 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -87,10 +88,13 @@ TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::StatsVisitor::NodeSet); TYPE_NAME_ALIAS(std::set< osg::Drawable * >, osgUtil::StatsVisitor::DrawableSet); +TYPE_NAME_ALIAS(std::set< osg::StateSet * >, osgUtil::StatsVisitor::StateSetSet); + BEGIN_OBJECT_REFLECTOR(osgUtil::StatsVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(); I_Method0(void, reset); + I_Method1(void, apply, IN, osg::Node &, node); I_Method1(void, apply, IN, osg::Group &, node); I_Method1(void, apply, IN, osg::Transform &, node); I_Method1(void, apply, IN, osg::LOD &, node); @@ -109,3 +113,5 @@ STD_PAIR_REFLECTOR(std::pair< unsigned int COMMA unsigned int >); STD_SET_REFLECTOR(std::set< osg::Drawable * >); +STD_SET_REFLECTOR(std::set< osg::StateSet * >); +