diff --git a/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp b/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp index bd12068eb..9a1fcbbc9 100644 --- a/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp +++ b/VisualStudio/osgWrappers/osgText/wrapper_osgText.dsp @@ -103,10 +103,6 @@ SOURCE=..\..\..\src\osgWrappers\osgText\Export.cpp SOURCE=..\..\..\src\osgWrappers\osgText\FadeText.cpp # End Source File -# Begin Source File -SOURCE=..\..\..\src\osgWrappers\osgText\FadeTextBKP.cpp -# End Source File - # Begin Source File SOURCE=..\..\..\src\osgWrappers\osgText\Font.cpp # End Source File diff --git a/src/osgWrappers/osgText/FadeText.cpp b/src/osgWrappers/osgText/FadeText.cpp index 3e34e4545..33fbce555 100644 --- a/src/osgWrappers/osgText/FadeText.cpp +++ b/src/osgWrappers/osgText/FadeText.cpp @@ -10,7 +10,11 @@ #include #include +#include +#include +#include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -22,7 +26,20 @@ TYPE_NAME_ALIAS(std::map< osg::View * COMMA osg::Vec4 >, osgText::FadeText::ViewBlendColourMap); -TYPE_NAME_ALIAS(std::map< osg::View * COMMA osg::Vec4 >, osgText::FadeText::ViewBlendColourMap); +BEGIN_OBJECT_REFLECTOR(osgText::FadeText) + I_BaseType(osgText::Text); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgText::Text &, text, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method0(osgText::FadeText::ViewBlendColourMap &, getViewBlendColourMap); + I_Method0(const osgText::FadeText::ViewBlendColourMap &, getViewBlendColourMap); + I_Method1(void, drawImplementation, IN, osg::RenderInfo &, renderInfo); + I_ReadOnlyProperty(osgText::FadeText::ViewBlendColourMap &, ViewBlendColourMap); +END_REFLECTOR STD_MAP_REFLECTOR(std::map< osg::View * COMMA osg::Vec4 >); diff --git a/src/osgWrappers/osgText/GNUmakefile b/src/osgWrappers/osgText/GNUmakefile index 264dc6e5b..810863966 100644 --- a/src/osgWrappers/osgText/GNUmakefile +++ b/src/osgWrappers/osgText/GNUmakefile @@ -4,7 +4,6 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ Export.cpp\ FadeText.cpp\ - FadeTextBKP.cpp\ Font.cpp\ String.cpp\ Text.cpp\