Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use TTF scaled metrics to calculate line height (#384)

This commit is contained in:
RH 2021-06-17 23:15:50 +10:00 committed by GitHub
parent bd10049c23
commit 7d8fe551cc
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos/2d/CCFontFreeType.cpp
View File

@ -25,11 +25,15 @@ THE SOFTWARE.
****************************************************************************/
#include "2d/CCFontFreeType.h"
#include <freetype/src/truetype/ttobjs.h>
#include FT_BBOX_H
#include "edtaa3func.h"
#include "2d/CCFontAtlas.h"
#include "base/CCDirector.h"
#include "base/ccUTF8.h"
#include "freetype/internal/tttypes.h"
#include "platform/CCFileUtils.h"
#include "platform/CCFileStream.h"
@ -228,7 +232,8 @@ bool FontFreeType::createFontObject(const std::string &fontName, float fontSize)
// store the face globally
_fontRef = face;
_lineHeight = static_cast<int>((_fontRef->size->metrics.ascender - _fontRef->size->metrics.descender) >> 6);
auto* ttSize = (TT_Size)(_fontRef->size);
_lineHeight = static_cast<int>((ttSize->metrics->ascender - ttSize->metrics->descender) >> 6);
// done and good
return true;
@ -329,7 +334,7 @@ int FontFreeType::getHorizontalKerningForChars(uint64_t firstChar, uint64_t sec
int FontFreeType::getFontAscender() const
{
return (static_cast<int>(_fontRef->size->metrics.ascender >> 6));
return (static_cast<int>(((TT_Size)_fontRef->size)->metrics->ascender >> 6));
}
const char* FontFreeType::getFontFamily() const