Updates to osgText and osgDB so that the loading of text fonts can use

osgDB::findFile() to locate font files from the OSGFILEPATH environmental
variable.
This commit is contained in:
Robert Osfield
2001-10-24 12:53:27 +00:00
parent 5853215f1c
commit a30a4132b8
3 changed files with 23 additions and 10 deletions

View File

@@ -15,6 +15,8 @@
#include <osgText/Text>
#include <osgDB/FileUtils>
#include "FTFace.h"
#include "FTGLBitmapFont.h"
#include "FTGLPixmapFont.h"
@@ -63,16 +65,21 @@ bool Font::
open(const std::string& font)
{
clear();
char* filename = osgDB::findFile(font.c_str());
if (filename)
{
_font=createFontObj();
if( _font!=NULL && _font->Open(font.c_str()) )
{
_init=true;
_fontName=font;
return true;
}
else
return false;
_font=createFontObj();
if( _font!=NULL && _font->Open(filename) )
{
_init=true;
_fontName=font;
return true;
}
else
return false;
}
}
bool Font::