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

Change osgText so that the Text drawable now can have its own StateSet

Browse Source 
that users can assign to it without it being overriden.  If none is
assigned externally it now uses a StateSet associated wit the Font assigned
to the Text.
This commit is contained in:
Robert Osfield
2006-07-04 13:56:29 +00:00
parent e8a3444b88
commit 3ad5140942
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgText/Font.cpp
View File

@@ -31,7 +31,7 @@ std::string osgText::findFontFile(const std::string& str)
{
// try looking in OSGFILEPATH etc first for fonts.
std::string filename = osgDB::findDataFile(str);
if (!filename.empty()) return std::string(filename);
if (!filename.empty()) return filename;
static osgDB::FilePathList s_FontFilePath;
@@ -68,6 +68,11 @@ std::string osgText::findFontFile(const std::string& str)
filename = osgDB::findFileInPath(filename,s_FontFilePath);
if (!filename.empty()) return filename;
}
else
{
filename = osgText::findFontFile(std::string("fonts/")+filename);
if (!filename.empty()) return filename;
}
// Not found, return empty string
osg::notify(osg::WARN)<<"Warning: font file \""<<str<<"\" not found."<<std::endl;
@@ -76,6 +81,8 @@ std::string osgText::findFontFile(const std::string& str)
osgText::Font* osgText::readFontFile(const std::string& filename)
{
if (filename=="") return 0;
std::string foundFile = findFontFile(filename);
if (foundFile.empty()) return 0;
@@ -132,6 +139,9 @@ Font::Font(FontImplementation* implementation):
{
setImplementation(implementation);
_texEnv = new osg::TexEnv(osg::TexEnv::BLEND);
_stateset = new osg::StateSet;
_stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
}
Font::~Font()