mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-25 15:09:03 +02:00
Code Issues Projects Releases Wiki Activity

- updated to properly use fontconfig for finding fonts

Browse Source
This commit is contained in:
Mark Vejvoda
2012-01-05 22:35:05 +00:00
parent ced374410c
commit fe72cb629b
12 changed files with 155 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/shared_lib/include/graphics/font.h
View File

@@ -101,7 +101,7 @@ public:
string getType() const;
//set
void setType(string typeX11, string typeGeneric);
void setType(string typeX11, string typeGeneric, string typeGenericFamily);
void setWidth(int width);
int getSize() const;
@@ -139,7 +139,7 @@ public:
Font3D *ConvertFont2DTo3D(Font2D *font);
const char* findFont(const char *firstFontToTry=NULL);
const char* findFont(const char *firstFontToTry=NULL,const char *firstFontFamilyToTry=NULL);
}}//end namespace

2
source/shared_lib/include/graphics/font_text.h
View File

@@ -36,7 +36,7 @@ public:
Text(FontTextHandlerType type);
virtual ~Text();
virtual void init(string fontName, int fontSize);
virtual void init(string fontName, string fontFamilyName, int fontSize);
virtual void SetFaceSize(int);
virtual int GetFaceSize();

2
source/shared_lib/include/graphics/gl/font_textFTGL.h
View File

@@ -33,7 +33,7 @@ public:
TextFTGL(FontTextHandlerType type);
virtual ~TextFTGL();
virtual void init(string fontName, int fontSize);
virtual void init(string fontName, string fontFamilyName, int fontSize);
virtual void SetFaceSize(int);
virtual int GetFaceSize();

3
source/shared_lib/include/graphics/gl/font_text_freetypegl.h
View File

@@ -41,7 +41,7 @@ public:
TextFreetypeGL(FontTextHandlerType type);
virtual ~TextFreetypeGL();
virtual void init(string fontName, int fontSize);
virtual void init(string fontName, string fontFamilyName, int fontSize);
virtual void SetFaceSize(int);
virtual int GetFaceSize();
@@ -66,6 +66,7 @@ private:
int fontFaceSize;
string fontName;
string fontFamilyName;
const char* fontFile;
void cleanupFont();