diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-06 18:33:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 18:33:20 +0100 |
| commit | 3873f84548cd91ec62b9cb045e75158df74e19f9 (patch) | |
| tree | 6ea447a629c3df5f8796095d267702afaec52b2e /scene/resources/dynamic_font.cpp | |
| parent | 53516d7a9ec7119b3a23e5fc3fd1c61dc1e3074c (diff) | |
| parent | a9b7843dca3ea3eda9f9f890a3e2c78542ca7561 (diff) | |
Merge pull request #24777 from volzhs/font-kerning
Fix font kerning
Diffstat (limited to 'scene/resources/dynamic_font.cpp')
| -rw-r--r-- | scene/resources/dynamic_font.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp index fce697a0ea..5660f0a1b9 100644 --- a/scene/resources/dynamic_font.cpp +++ b/scene/resources/dynamic_font.cpp @@ -281,18 +281,6 @@ const Pair<const DynamicFontAtSize::Character *, DynamicFontAtSize *> DynamicFon return Pair<const Character *, DynamicFontAtSize *>(chr, const_cast<DynamicFontAtSize *>(this)); } -float DynamicFontAtSize::_get_kerning_advance(const DynamicFontAtSize *font, CharType p_char, CharType p_next) const { - float advance = 0.0; - - if (p_next) { - FT_Vector delta; - FT_Get_Kerning(font->face, p_char, p_next, FT_KERNING_DEFAULT, &delta); - advance = (delta.x / 64.0) / oversampling; - } - - return advance; -} - Size2 DynamicFontAtSize::get_char_size(CharType p_char, CharType p_next, const Vector<Ref<DynamicFontAtSize> > &p_fallbacks) const { if (!valid) @@ -301,7 +289,6 @@ Size2 DynamicFontAtSize::get_char_size(CharType p_char, CharType p_next, const V Pair<const Character *, DynamicFontAtSize *> char_pair_with_font = _find_char_with_font(p_char, p_fallbacks); const Character *ch = char_pair_with_font.first; - DynamicFontAtSize *font = char_pair_with_font.second; ERR_FAIL_COND_V(!ch, Size2()); Size2 ret(0, get_height()); @@ -309,7 +296,6 @@ Size2 DynamicFontAtSize::get_char_size(CharType p_char, CharType p_next, const V if (ch->found) { ret.x = ch->advance; } - ret.x += _get_kerning_advance(font, p_char, p_next); return ret; } @@ -358,8 +344,6 @@ float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2 &p_pos, CharT advance = ch->advance; } - advance += _get_kerning_advance(font, p_char, p_next); - return advance; } |