Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix font rendering for big font sizes

Browse source 
This should fix #81. If font creation fails because we're over max.
texture size, scale the glyphs down by some amount and then upscale the
text that is rendered. This gives a somewhat blurred image, but it works
for a lot more font sizes.
This commit is contained in:
Bim Overbohm 2013-06-12 14:42:09 +02:00
parent 850147016f
commit 8436c16426
2 changed files with 67 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
src/Font.cpp
View file

@ -70,6 +70,7 @@ void Font::initLibrary()
} }
Font::Font(std::string path, int size) Font::Font(std::string path, int size)
: fontScale(1.0f)
{ {
mPath = path; mPath = path;
mSize = size; mSize = size;
@ -84,18 +85,7 @@ void Font::init()
mMaxGlyphHeight = 0; mMaxGlyphHeight = 0;
if(FT_New_Face(sLibrary, mPath.c_str(), 0, &face))
{
LOG(LogError) << "Error creating font face! (path: " << mPath.c_str();
return;
}
//FT_Set_Char_Size(face, 0, size * 64, getDpiX(), getDpiY());
FT_Set_Pixel_Sizes(face, 0, mSize);
buildAtlas(); buildAtlas();
FT_Done_Face(face);
} }
void Font::deinit() void Font::deinit()
@ -106,6 +96,15 @@ void Font::deinit()
void Font::buildAtlas() void Font::buildAtlas()
{ {
if(FT_New_Face(sLibrary, mPath.c_str(), 0, &face))
{
LOG(LogError) << "Error creating font face! (path: " << mPath.c_str();
return;
}
//FT_Set_Char_Size(face, 0, size * 64, getDpiX(), getDpiY());
FT_Set_Pixel_Sizes(face, 0, mSize);
//find the size we should use //find the size we should use
FT_GlyphSlot g = face->glyph; FT_GlyphSlot g = face->glyph;
int w = 0; int w = 0;
@ -130,8 +129,6 @@ void Font::buildAtlas()
textureWidth = w; textureWidth = w;
textureHeight = h; textureHeight = h;
//create the texture //create the texture
glGenTextures(1, &textureID); glGenTextures(1, &textureID);
glBindTexture(GL_TEXTURE_2D, textureID); glBindTexture(GL_TEXTURE_2D, textureID);
@ -171,7 +168,7 @@ void Font::buildAtlas()
if(x + g->bitmap.width >= textureWidth) if(x + g->bitmap.width >= textureWidth)
{ {
x = 0; x = 0;
y += maxHeight; y += maxHeight + 1; //leave one pixel of space between glyphs
maxHeight = 0; maxHeight = 0;
} }
@ -185,23 +182,34 @@ void Font::buildAtlas()
charData[i].texY = y; charData[i].texY = y;
charData[i].texW = g->bitmap.width; charData[i].texW = g->bitmap.width;
charData[i].texH = g->bitmap.rows; charData[i].texH = g->bitmap.rows;
charData[i].advX = g->metrics.horiAdvance >> 6; charData[i].advX = g->metrics.horiAdvance / 64.0f;
charData[i].advY = g->advance.y >> 6; charData[i].advY = g->metrics.vertAdvance / 64.0f;
charData[i].bearingY = g->metrics.horiBearingY >> 6; charData[i].bearingY = g->metrics.horiBearingY / 64.0f;
if(charData[i].texH > mMaxGlyphHeight) if(charData[i].texH > mMaxGlyphHeight)
mMaxGlyphHeight = charData[i].texH; mMaxGlyphHeight = charData[i].texH;
x += g->bitmap.width; x += g->bitmap.width + 1; //leave one pixel of space between glyphs
}
if(y >= textureHeight)
{
LOG(LogError) << "Error - font size exceeded texture size! If you were doing something reasonable, tell Aloshi to fix it!";
} }
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
FT_Done_Face(face);
if((y + maxHeight) >= textureHeight)
{
//failed to create a proper font texture
LOG(LogError) << "Error - font with size " << mSize << " exceeded texture size! Trying again...";
//try a 3/4th smaller size and redo initialization
fontScale *= 1.25f;
mSize = (int)(mSize * (1.0f / fontScale));
deinit();
init();
}
else {
LOG(LogInfo) << "Created font with size " << mSize << std::endl;
}
//std::cout << "generated texture \"" << textureID << "\" (w: " << w << " h: " << h << ")" << std::endl; //std::cout << "generated texture \"" << textureID << "\" (w: " << w << " h: " << h << ")" << std::endl;
} }
@ -249,62 +257,62 @@ void Font::drawText(std::string text, int startx, int starty, int color)
return; return;
} }
starty += mMaxGlyphHeight;
//padding (another 0.5% is added to the bottom through the sizeText function)
starty += (int)(mMaxGlyphHeight * 0.1f);
int pointCount = text.length() * 2; int pointCount = text.length() * 2;
point* points = new point[pointCount]; point* points = new point[pointCount];
tex* texs = new tex[pointCount]; tex* texs = new tex[pointCount];
GLubyte* colors = new GLubyte[pointCount * 3 * 4]; GLubyte* colors = new GLubyte[pointCount * 3 * 4];
glBindTexture(GL_TEXTURE_2D, textureID); glBindTexture(GL_TEXTURE_2D, textureID);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
//texture atlas width/height //texture atlas width/height
float tw = (float)textureWidth; float tw = (float)textureWidth;
float th = (float)textureHeight; float th = (float)textureHeight;
int p = 0;
int i = 0;
float x = (float)startx; float x = (float)startx;
float y = (float)starty; float y = starty + mMaxGlyphHeight * 1.1f * fontScale; //padding (another 0.5% is added to the bottom through the sizeText function)
for(; p < pointCount; i++, p++)
int p = 0;
for(int i = 0; p < pointCount; i++, p++)
{ {
unsigned char letter = text[i]; unsigned char letter = text[i];
if(letter < 32 || letter >= 128) if(letter < 32 || letter >= 128)
letter = 127; //print [X] if character is not standard ASCII letter = 127; //print [X] if character is not standard ASCII
points[p].pos0x = x; points[p].pos0y = y + charData[letter].texH - charData[letter].bearingY; points[p].pos0x = x;
points[p].pos1x = x + charData[letter].texW; points[p].pos1y = y - charData[letter].bearingY; points[p].pos0y = y + (charData[letter].texH - charData[letter].bearingY) * fontScale;
points[p].pos2x = x; points[p].pos2y = y - charData[letter].bearingY; points[p].pos1x = x + charData[letter].texW * fontScale;
points[p].pos1y = y - charData[letter].bearingY * fontScale;
texs[p].tex0x = charData[letter].texX / tw; texs[p].tex0y = (charData[letter].texY + charData[letter].texH) / th; points[p].pos2x = x;
texs[p].tex1x = (charData[letter].texX + charData[letter].texW) / tw; texs[p].tex1y = charData[letter].texY / th; points[p].pos2y = points[p].pos1y;
texs[p].tex2x = charData[letter].texX / tw; texs[p].tex2y = charData[letter].texY / th;
texs[p].tex0x = charData[letter].texX / tw;
texs[p].tex0y = (charData[letter].texY + charData[letter].texH) / th;
texs[p].tex1x = (charData[letter].texX + charData[letter].texW) / tw;
texs[p].tex1y = charData[letter].texY / th;
texs[p].tex2x = texs[p].tex0x;
texs[p].tex2y = texs[p].tex1y;
p++; p++;
points[p].pos0x = x; points[p].pos0y = y + charData[letter].texH - charData[letter].bearingY; points[p].pos0x = points[p-1].pos0x;
points[p].pos1x = x + charData[letter].texW; points[p].pos1y = y - charData[letter].bearingY; points[p].pos0y = points[p-1].pos0y;
points[p].pos2x = x + charData[letter].texW; points[p].pos2y = y + charData[letter].texH - charData[letter].bearingY; points[p].pos1x = points[p-1].pos1x;
points[p].pos1y = points[p-1].pos1y;
points[p].pos2x = points[p-1].pos1x;
points[p].pos2y = points[p-1].pos0y;
texs[p].tex0x = charData[letter].texX / tw; texs[p].tex0y = (charData[letter].texY + charData[letter].texH) / th; texs[p].tex0x = texs[p-1].tex0x;
texs[p].tex1x = (charData[letter].texX + charData[letter].texW) / tw; texs[p].tex1y = charData[letter].texY / th; texs[p].tex0y = texs[p-1].tex0y;
texs[p].tex2x = texs[p].tex1x; texs[p].tex2y = texs[p].tex0y; texs[p].tex1x = texs[p-1].tex1x;
texs[p].tex1y = texs[p-1].tex1y;
texs[p].tex2x = texs[p-1].tex1x;
texs[p].tex2y = texs[p-1].tex0y;
x += charData[letter].advX * fontScale;
x += charData[letter].advX;
} }
Renderer::buildGLColorArray(colors, color, pointCount * 3); Renderer::buildGLColorArray(colors, color, pointCount * 3);
@ -340,18 +348,17 @@ void Font::sizeText(std::string text, int* w, int* h)
if(letter < 32 || letter >= 128) if(letter < 32 || letter >= 128)
letter = 127; letter = 127;
cwidth += charData[letter].advX; cwidth += charData[letter].advX * fontScale;
} }
if(w != NULL) if(w != NULL)
*w = cwidth; *w = cwidth;
if(h != NULL) if(h != NULL)
*h = (int)(mMaxGlyphHeight + mMaxGlyphHeight * 0.5f); *h = (int)(mMaxGlyphHeight * 1.5f * fontScale);
} }
int Font::getHeight() int Font::getHeight()
{ {
return (int)(mMaxGlyphHeight * 1.5f); return (int)(mMaxGlyphHeight * 1.5f * fontScale);
} }

7
src/Font.h
View file

@ -26,10 +26,10 @@ public:
int texW; int texW;
int texH; int texH;
int advX; float advX;
int advY; float advY;
int bearingY; float bearingY;
}; };
charPosData charData[128]; charPosData charData[128];
@ -58,6 +58,7 @@ private:
int textureWidth; //OpenGL texture width int textureWidth; //OpenGL texture width
int textureHeight; //OpenGL texture height int textureHeight; //OpenGL texture height
int mMaxGlyphHeight; int mMaxGlyphHeight;
float fontScale; //!<Font scale factor. It is > 1.0 if the font would be to big for the texture
std::string mPath; std::string mPath;
int mSize; int mSize;