- added packaged game fonts

- updated code to search new default font folder
- added chinese language file from the fourm for testing
This commit is contained in:
Mark Vejvoda
2011-06-07 02:37:58 +00:00
parent df178e5eb4
commit 226e8783c0
12 changed files with 30 additions and 98 deletions

View File

@@ -23,6 +23,8 @@ class Text
{
public:
static std::string DEFAULT_FONT_PATH;
Text();
virtual ~Text();

View File

@@ -28,20 +28,15 @@ namespace Shared { namespace Graphics { namespace Gl {
class FontGl {
protected:
//#ifndef USE_FTGL
GLuint handle;
//#endif
static string default_fonttype;
public:
//#ifndef USE_FTGL
GLuint getHandle() const {return handle;}
//#endif
GLuint getHandle() const {return handle;}
static string getDefault_fontType() { return default_fonttype; }
static void setDefault_fontType(string value) { default_fonttype = value; }
static string getDefault_fontType() {return default_fonttype;}
static void setDefault_fontType(string value) {default_fonttype = value;}
};
// =====================================================

View File

@@ -19,10 +19,6 @@ namespace Shared { namespace Graphics { namespace Gl {
class Font2DGl;
class Font3DGl;
//#ifdef USE_FTGL
// class TextFTGL;
//#endif
// =====================================================
// class TextRenderer2DGl
@@ -33,10 +29,6 @@ private:
Font2DGl *font;
bool rendering;
//#ifdef USE_FTGL
// TextFTGL *fontFTGL;
//#endif
public:
TextRenderer2DGl();
virtual ~TextRenderer2DGl();
@@ -55,10 +47,6 @@ private:
Font3DGl *font;
bool rendering;
//#ifdef USE_FTGL
// TextFTGL *fontFTGL;
//#endif
public:
TextRenderer3DGl();
virtual ~TextRenderer3DGl();