- updated findfont method to be shared and to use more default fonts if main ones are not found

This commit is contained in:
Mark Vejvoda
2011-11-19 07:35:12 +00:00
parent ce68ca0a7d
commit 3fd8c1ef90
6 changed files with 140 additions and 252 deletions

View File

@@ -139,6 +139,8 @@ public:
Font3D *ConvertFont2DTo3D(Font2D *font);
const char* findFont(const char *firstFontToTry=NULL);
}}//end namespace
#endif

View File

@@ -48,11 +48,8 @@ public:
private:
FTFont *ftFont;
//FTGLPixmapFont *ftFont;
const char* fontFile;
const char* findFont(const char *firstFontToTry=NULL);
void cleanupFont();
};

View File

@@ -54,20 +54,16 @@ public:
virtual float LineHeight(const wchar_t* = L" ", const int = -1);
private:
//FTFont *ftFont;
VertexBuffer *buffer;
TextureAtlas *atlas;
TextureFont *font;
//TextureGlyph *glyph;
FontManager *manager;
//Markup markup;
int fontFaceSize;
string fontName;
const char* fontFile;
const char* findFont(const char *firstFontToTry=NULL);
void cleanupFont();
};