diff --git a/src/osgWrappers/osgText/FadeText.cpp b/src/osgWrappers/osgText/FadeText.cpp index 2e657c15f..fc261ecc1 100644 --- a/src/osgWrappers/osgText/FadeText.cpp +++ b/src/osgWrappers/osgText/FadeText.cpp @@ -24,8 +24,6 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< osg::View * COMMA osg::Vec4 >, osgText::FadeText::ViewBlendColourMap); - BEGIN_OBJECT_REFLECTOR(osgText::FadeText) I_BaseType(osgText::Text); I_Constructor0(____FadeText, @@ -55,22 +53,20 @@ BEGIN_OBJECT_REFLECTOR(osgText::FadeText) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method0(osgText::FadeText::ViewBlendColourMap &, getViewBlendColourMap, - __ViewBlendColourMap_R1__getViewBlendColourMap, - "", + I_Method1(void, setFadeSpeed, IN, float, fadeSpeed, + __void__setFadeSpeed__float, + "Set the speed that the alpha value changes as the text is occluded or becomes visible. ", ""); - I_Method0(const osgText::FadeText::ViewBlendColourMap &, getViewBlendColourMap, - __C5_ViewBlendColourMap_R1__getViewBlendColourMap, - "", + I_Method0(float, getFadeSpeed, + __float__getFadeSpeed, + "Get the speed that the alpha value changes. ", ""); I_Method1(void, drawImplementation, IN, osg::RenderInfo &, renderInfo, __void__drawImplementation__osg_RenderInfo_R1, "Draw the text. ", ""); - I_SimpleProperty(osgText::FadeText::ViewBlendColourMap &, ViewBlendColourMap, - __ViewBlendColourMap_R1__getViewBlendColourMap, - 0); + I_SimpleProperty(float, FadeSpeed, + __float__getFadeSpeed, + __void__setFadeSpeed__float); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< osg::View * COMMA osg::Vec4 >); - diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index f4c5d87a7..02dc7e383 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -498,15 +498,15 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) ""); I_Method2(bool, projectWindowIntoObject, IN, const osg::Vec3 &, window, IN, osg::Vec3 &, object, __bool__projectWindowIntoObject__C5_osg_Vec3_R1__osg_Vec3_R1, - "Calculate, via glUnProject, the object coordinates of a window point. ", + "Calculate the object coordinates of a point in window coordinates. ", "Note, current implementation requires that SceneView::draw() has been previously called for projectWindowIntoObject to produce valid values. Consistent with OpenGL windows coordinates are calculated relative to the bottom left of the window. Returns true on successful projection."); I_Method4(bool, projectWindowXYIntoObject, IN, int, x, IN, int, y, IN, osg::Vec3 &, near_point, IN, osg::Vec3 &, far_point, __bool__projectWindowXYIntoObject__int__int__osg_Vec3_R1__osg_Vec3_R1, - "Calculate, via glUnProject, the object coordinates of a window x,y when projected onto the near and far planes. ", + "Calculate the object coordinates of a window x,y when projected onto the near and far planes. ", "Note, current implementation requires that SceneView::draw() has been previously called for projectWindowIntoObject to produce valid values. Consistent with OpenGL windows coordinates are calculated relative to the bottom left of the window. Returns true on successful projection."); I_Method2(bool, projectObjectIntoWindow, IN, const osg::Vec3 &, object, IN, osg::Vec3 &, window, __bool__projectObjectIntoWindow__C5_osg_Vec3_R1__osg_Vec3_R1, - "Calculate, via glProject, the object coordinates of a window. ", + "Calculate the window coordinates of a point in object coordinates. ", "Note, current implementation requires that SceneView::draw() has been previously called for projectWindowIntoObject to produce valid values. Consistent with OpenGL windows coordinates are calculated relative to the bottom left of the window, whereas window API's normally have the top left as the origin, so you may need to pass in (mouseX,window_height-mouseY,...). Returns true on successful projection."); I_Method1(void, setFrameStamp, IN, osg::FrameStamp *, fs, __void__setFrameStamp__osg_FrameStamp_P1,