AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fontcache bug fixes

This commit is contained in:
Jack Andersen 2015-11-23 16:10:47 -10:00
parent 0514ba9670
commit 99d85ba60c
1 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
specter/lib/FontCache.cpp
View File

@ -4,6 +4,7 @@
#include FT_GZIP_H #include FT_GZIP_H
#include FT_SYSTEM_H #include FT_SYSTEM_H
#include FT_OUTLINE_H
#include <freetype/internal/internal.h> #include <freetype/internal/internal.h>
#include <freetype/internal/ftstream.h> #include <freetype/internal/ftstream.h>
@ -114,6 +115,12 @@ static void MemcpyRect(RgbaPixel* img, const FT_Bitmap* bmp, unsigned slice, uns
} }
static inline void GridFitGlyph(FT_GlyphSlot slot, FT_UInt& width, FT_UInt& height)
{
width = slot->metrics.width >> 6;
height = slot->metrics.height >> 6;
}
FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face, FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face,
bool subpixel, Athena::io::FileWriter& writer) bool subpixel, Athena::io::FileWriter& writer)
{ {
@ -135,19 +142,20 @@ FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face,
{ {
++glyphCount; ++glyphCount;
FT_Load_Glyph(face, gindex, baseFlags); FT_Load_Glyph(face, gindex, baseFlags);
unsigned width = face->glyph->metrics.width / 64; FT_UInt width, height;
if (subpixel) GridFitGlyph(face->glyph, width, height);
width /= 3; if (curLineWidth + width + 1 > TEXMAP_DIM)
curLineHeight = std::max(curLineHeight, unsigned(face->glyph->metrics.height / 64));
if (curLineWidth + width + 1 > TEXMAP_DIM || totalHeight + curLineHeight + 1 > TEXMAP_DIM)
{ {
totalHeight += curLineHeight + 1;
curLineHeight = 0;
curLineWidth = 1;
}
curLineHeight = std::max(curLineHeight, height);
if (totalHeight + curLineHeight + 1 > TEXMAP_DIM) if (totalHeight + curLineHeight + 1 > TEXMAP_DIM)
{ {
totalHeight = 1; totalHeight = 1;
++fullTexmapLayers; ++fullTexmapLayers;
} //printf("StagedB: %u\n", gindex);
else
totalHeight += curLineHeight + 1;
curLineHeight = 0; curLineHeight = 0;
curLineWidth = 1; curLineWidth = 1;
} }
@ -169,6 +177,7 @@ FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face,
size_t bufSz; size_t bufSz;
if (fullTexmapLayers) if (fullTexmapLayers)
{ {
//printf("ALLOC: %u\n", fullTexmapLayers + 1);
size_t count = TEXMAP_DIM * TEXMAP_DIM * (fullTexmapLayers + 1); size_t count = TEXMAP_DIM * TEXMAP_DIM * (fullTexmapLayers + 1);
texmap.reset(new RgbaPixel[count]); texmap.reset(new RgbaPixel[count]);
bufSz = count * sizeof(RgbaPixel); bufSz = count * sizeof(RgbaPixel);
@ -206,16 +215,18 @@ FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face,
g.m_rightPadding = 0; g.m_rightPadding = 0;
g.m_verticalOffset = face->glyph->metrics.horiBearingY / 64; g.m_verticalOffset = face->glyph->metrics.horiBearingY / 64;
g.m_kernIdx = 0; g.m_kernIdx = 0;
curLineHeight = std::max(curLineHeight, face->glyph->bitmap.rows); if (curLineWidth + g.m_width + 1 > TEXMAP_DIM)
if (curLineWidth + g.m_width + 1 > TEXMAP_DIM || totalHeight + curLineHeight + 1 > TEXMAP_DIM)
{ {
totalHeight += curLineHeight + 1;
curLineHeight = 0;
curLineWidth = 1;
}
curLineHeight = std::max(curLineHeight, face->glyph->bitmap.rows);
if (totalHeight + curLineHeight + 1 > TEXMAP_DIM) if (totalHeight + curLineHeight + 1 > TEXMAP_DIM)
{ {
totalHeight = 1; totalHeight = 1;
++fullTexmapLayers; ++fullTexmapLayers;
} //printf("RealB: %u\n", gindex);
else
totalHeight += curLineHeight + 1;
curLineHeight = 0; curLineHeight = 0;
curLineWidth = 1; curLineWidth = 1;
} }
@ -236,6 +247,7 @@ FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face,
size_t bufSz; size_t bufSz;
if (fullTexmapLayers) if (fullTexmapLayers)
{ {
//printf("ALLOC: %u\n", fullTexmapLayers + 1);
size_t count = TEXMAP_DIM * TEXMAP_DIM * (fullTexmapLayers + 1); size_t count = TEXMAP_DIM * TEXMAP_DIM * (fullTexmapLayers + 1);
texmap.reset(new GreyPixel[count]); texmap.reset(new GreyPixel[count]);
bufSz = count * sizeof(GreyPixel); bufSz = count * sizeof(GreyPixel);
@ -271,18 +283,20 @@ FontAtlas::FontAtlas(boo::IGraphicsDataFactory* gf, FT_Face face,
g.m_leftPadding = 0; g.m_leftPadding = 0;
g.m_advance = face->glyph->advance.x; g.m_advance = face->glyph->advance.x;
g.m_rightPadding = 0; g.m_rightPadding = 0;
g.m_verticalOffset = face->glyph->metrics.horiBearingY / 64; g.m_verticalOffset = face->glyph->metrics.horiBearingY >> 6;
g.m_kernIdx = 0; g.m_kernIdx = 0;
curLineHeight = std::max(curLineHeight, face->glyph->bitmap.rows); if (curLineWidth + g.m_width + 1 > TEXMAP_DIM)
if (curLineWidth + g.m_width + 1 > TEXMAP_DIM || totalHeight + curLineHeight + 1 > TEXMAP_DIM)
{ {
totalHeight += curLineHeight + 1;
curLineHeight = 0;
curLineWidth = 1;
}
curLineHeight = std::max(curLineHeight, face->glyph->bitmap.rows);
if (totalHeight + curLineHeight + 1 > TEXMAP_DIM) if (totalHeight + curLineHeight + 1 > TEXMAP_DIM)
{ {
totalHeight = 1; totalHeight = 1;
++fullTexmapLayers; ++fullTexmapLayers;
} //printf("RealB: %u\n", gindex);
else
totalHeight += curLineHeight + 1;
curLineHeight = 0; curLineHeight = 0;
curLineWidth = 1; curLineWidth = 1;
} }
@ -314,15 +328,6 @@ FontCache::Library::~Library()
FT_Done_FreeType(m_lib); FT_Done_FreeType(m_lib);
} }
static FT_Library InitLib()
{
FT_Library ret;
FT_Error err = FT_Init_FreeType(&ret);
if (err)
Log.report(LogVisor::FatalError, "unable to FT_Init_FreeType");
return ret;
}
FontCache::FontCache(const HECL::Runtime::FileStoreManager& fileMgr) FontCache::FontCache(const HECL::Runtime::FileStoreManager& fileMgr)
: m_fileMgr(fileMgr), : m_fileMgr(fileMgr),
m_cacheRoot(m_fileMgr.getStoreRoot() + _S("/fontcache")), m_cacheRoot(m_fileMgr.getStoreRoot() + _S("/fontcache")),