FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added FadeText::setFadeSpeed and made internal data structures protected.

Browse Source
This commit is contained in:
Robert Osfield
2006-10-24 09:06:28 +00:00
parent 648455da34
commit 85dc696c09
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgText/FadeText.cpp
View File

@@ -273,7 +273,7 @@ GlobalFadeText* getGlobalFadeText()
return s_globalFadeText.get();
}
struct FadeTextUpdateCallback : public osg::Drawable::UpdateCallback
struct FadeText::FadeTextUpdateCallback : public osg::Drawable::UpdateCallback
{
FadeTextData _ftd;
@@ -291,7 +291,7 @@ struct FadeTextUpdateCallback : public osg::Drawable::UpdateCallback
_ftd._fadeText = fadeText;
float fadeSpeed = 0.01f;
float fadeSpeed = fadeText->getFadeSpeed();
GlobalFadeText::ViewFadeTextMap& vftm = gft->_viewFadeTextMap;
for(GlobalFadeText::ViewFadeTextMap::iterator itr = vftm.begin();
@@ -342,6 +342,7 @@ FadeText::FadeText(const Text& text,const osg::CopyOp& copyop):
void FadeText::init()
{
_fadeSpeed = 0.01f;
setUpdateCallback(new FadeTextUpdateCallback());
}