LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 07:41:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added basic kerning support for TrueType and BMFont fonts (resolves issue #1055.)

Browse Source
This commit is contained in:
Alex Szpakowski
2015-07-02 21:07:34 -03:00
parent 4550409ffa
commit bf432aff7c
8 changed files with 80 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+33 -2
View File
@@ -316,6 +316,29 @@ const Font::Glyph &Font::findGlyph(uint32 glyph)
return addGlyph(glyph);
}
float Font::getKerning(uint32 leftglyph, uint32 rightglyph)
{
uint64 packedglyphs = ((uint64) leftglyph << 32) | (uint64) rightglyph;
const auto it = kerning.find(packedglyphs);
if (it != kerning.end())
return it->second;
float k = rasterizers[0]->getKerning(leftglyph, rightglyph);
for (const auto &r : rasterizers)
{
if (r->hasGlyph(leftglyph) && r->hasGlyph(rightglyph))
{
k = r->getKerning(leftglyph, rightglyph);
break;
}
}
kerning[packedglyphs] = k;
return k;
}
float Font::getHeight() const
{
return (float) height;
@@ -337,6 +360,8 @@ std::vector<Font::DrawCommand> Font::generateVertices(const std::string &text, s
size_t vertstartsize = vertices.size();
vertices.reserve(vertstartsize + text.length() * 4);
uint32 prevglyph = 0;
try
{
utf8::iterator<std::string::const_iterator> i(text.begin(), text.begin(), text.end());
@@ -370,17 +395,21 @@ std::vector<Font::DrawCommand> Font::generateVertices(const std::string &text, s
dy = offset.y;
drawcommands.clear();
vertices.resize(vertstartsize);
prevglyph = 0;
continue;
}
// Add kerning to the current horizontal offset.
dx += getKerning(prevglyph, g);
if (glyph.texture != 0)
{
// Copy the vertices and set their proper relative positions.
for (int j = 0; j < 4; j++)
{
vertices.push_back(glyph.vertices[j]);
vertices.back().x += dx;
vertices.back().y += dy + lineheight;
vertices.back().x += dx /*+ kerning*/;
vertices.back().y += dy /*+ kerning.y*/ + lineheight;
}
// Check if glyph texture has changed since the last iteration.
@@ -403,6 +432,8 @@ std::vector<Font::DrawCommand> Font::generateVertices(const std::string &text, s
// Account for extra spacing given to space characters.
if (g == ' ' && extra_spacing != 0.0f)
dx = floorf(dx + extra_spacing);
prevglyph = g;
}
}
catch (utf8::exception &e)