mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-16 21:33:59 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix for font width calculation

Browse Source
This commit is contained in:
Mark Vejvoda
2011-05-25 22:58:30 +00:00
parent 3eaabb1b41
commit 4c7d522b6b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/shared_lib/sources/platform/unix/gl_wrap.cpp
View File

@@ -62,6 +62,7 @@ void createGlFontBitmaps(uint32 &base, const string &type, int size, int width,
int last = (fontInfo->max_byte1 << 8) + fontInfo->max_char_or_byte2; int last = (fontInfo->max_byte1 << 8) + fontInfo->max_char_or_byte2;
int count = last - first + 1; int count = last - first + 1;
/*
// 16-bit fonts have more than one row; indexing into // 16-bit fonts have more than one row; indexing into
// per_char is trickier. // per_char is trickier.
int rows = fontInfo->max_byte1 - fontInfo->min_byte1 + 1; int rows = fontInfo->max_byte1 - fontInfo->min_byte1 + 1;
@@ -123,9 +124,9 @@ void createGlFontBitmaps(uint32 &base, const string &type, int size, int width,
} }
} }
//Shared::Graphics::Font::charCount = charIndex; //Shared::Graphics::Font::charCount = charIndex;
*/
/*
//for(unsigned int i = 0; fontInfo->per_char != NULL && i < static_cast<unsigned int> (charCount); ++i) { //for(unsigned int i = 0; fontInfo->per_char != NULL && i < static_cast<unsigned int> (charCount); ++i) {
for(unsigned int i = 0; fontInfo->per_char != NULL && i < static_cast<unsigned int> (count); ++i) { for(unsigned int i = 0; fontInfo->per_char != NULL && i < static_cast<unsigned int> (count); ++i) {
if(i < fontInfo->min_char_or_byte2 || if(i < fontInfo->min_char_or_byte2 ||
@@ -140,7 +141,6 @@ void createGlFontBitmaps(uint32 &base, const string &type, int size, int width,
// - fontInfo->per_char[p].lbearing)); // - fontInfo->per_char[p].lbearing));
} }
} }
*/
glXUseXFont(fontInfo->fid, 0, charCount, base); glXUseXFont(fontInfo->fid, 0, charCount, base);
XFreeFont(display, fontInfo); XFreeFont(display, fontInfo);