edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up font buffers & texturedata

Browse source
This commit is contained in:
def 2020-09-30 23:38:05 +02:00
parent c92af2e2df
commit 61e985457d
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/engine/client/text.cpp
View file

@ -80,6 +80,17 @@ struct CFontSizeData
class CFont class CFont
{ {
public: public:
~CFont()
{
free(m_pBuf);
delete[] m_TextureData[0];
delete[] m_TextureData[1];
for(size_t i = 0; i < m_FtFallbackFonts.size(); i++)
{
free(m_FtFallbackFonts[i].m_pBuf);
}
}
void InitFontSizes() void InitFontSizes()
{ {
for(int i = 0; i < NUM_FONT_SIZES; ++i) for(int i = 0; i < NUM_FONT_SIZES; ++i)
@ -97,11 +108,13 @@ public:
return &m_aFontSizes[FontSize - MIN_FONT_SIZE]; return &m_aFontSizes[FontSize - MIN_FONT_SIZE];
} }
void *m_pBuf;
char m_aFilename[512]; char m_aFilename[512];
FT_Face m_FtFace; FT_Face m_FtFace;
struct SFontFallBack struct SFontFallBack
{ {
void *m_pBuf;
char m_aFilename[512]; char m_aFilename[512];
FT_Face m_FtFace; FT_Face m_FtFace;
}; };
@ -584,7 +597,14 @@ public:
{ {
for(size_t i = 0; i < m_Fonts.size(); ++i) for(size_t i = 0; i < m_Fonts.size(); ++i)
{ {
DestroyFont(m_Fonts[i]); FT_Done_Face(m_Fonts[i]->m_FtFace);
for(CFont::SFontFallBack &FallbackFont : m_Fonts[i]->m_FtFallbackFonts)
{
FT_Done_Face(FallbackFont.m_FtFace);
}
delete m_Fonts[i];
} }
if(m_FTLibrary != 0) if(m_FTLibrary != 0)
@ -660,6 +680,7 @@ public:
dbg_msg("textrender", "loaded pFont from '%s'", pFilename); dbg_msg("textrender", "loaded pFont from '%s'", pFilename);
pFont->m_pBuf = (void *)pBuf;
pFont->m_CurTextureDimensions[0] = 1024; pFont->m_CurTextureDimensions[0] = 1024;
pFont->m_TextureData[0] = new unsigned char[pFont->m_CurTextureDimensions[0] * pFont->m_CurTextureDimensions[0]]; pFont->m_TextureData[0] = new unsigned char[pFont->m_CurTextureDimensions[0] * pFont->m_CurTextureDimensions[0]];
mem_zero(pFont->m_TextureData[0], pFont->m_CurTextureDimensions[0] * pFont->m_CurTextureDimensions[0] * sizeof(unsigned char)); mem_zero(pFont->m_TextureData[0], pFont->m_CurTextureDimensions[0] * pFont->m_CurTextureDimensions[0] * sizeof(unsigned char));
@ -683,6 +704,7 @@ public:
virtual bool LoadFallbackFont(CFont *pFont, const char *pFilename, const unsigned char *pBuf, size_t Size) virtual bool LoadFallbackFont(CFont *pFont, const char *pFilename, const unsigned char *pBuf, size_t Size)
{ {
CFont::SFontFallBack FallbackFont; CFont::SFontFallBack FallbackFont;
FallbackFont.m_pBuf = (void *)pBuf;
str_copy(FallbackFont.m_aFilename, pFilename, sizeof(FallbackFont.m_aFilename)); str_copy(FallbackFont.m_aFilename, pFilename, sizeof(FallbackFont.m_aFilename));
if(FT_New_Memory_Face(m_FTLibrary, pBuf, Size, 0, &FallbackFont.m_FtFace) == 0) if(FT_New_Memory_Face(m_FTLibrary, pBuf, Size, 0, &FallbackFont.m_FtFace) == 0)
@ -715,27 +737,6 @@ public:
return NULL; return NULL;
} }
virtual void DestroyFont(CFont *pFont)
{
for(size_t i = 0; i < m_Fonts.size(); ++i)
{
if(m_Fonts[i] == pFont)
{
m_Fonts[i] = m_Fonts[m_Fonts.size() - 1];
m_Fonts.pop_back();
FT_Done_Face(pFont->m_FtFace);
for(CFont::SFontFallBack &FallbackFont : pFont->m_FtFallbackFonts)
{
FT_Done_Face(FallbackFont.m_FtFace);
}
delete pFont;
}
}
}
virtual void SetDefaultFont(CFont *pFont) virtual void SetDefaultFont(CFont *pFont)
{ {
dbg_msg("textrender", "default pFont set %p", pFont); dbg_msg("textrender", "default pFont set %p", pFont);

1
src/engine/textrender.h
View file

@ -82,7 +82,6 @@ public:
virtual bool LoadFallbackFont(CFont *pFont, const char *pFilename, const unsigned char *pBuf, size_t Size) = 0; virtual bool LoadFallbackFont(CFont *pFont, const char *pFilename, const unsigned char *pBuf, size_t Size) = 0;
virtual CFont *GetFont(int FontIndex) = 0; virtual CFont *GetFont(int FontIndex) = 0;
virtual CFont *GetFont(const char *pFilename) = 0; virtual CFont *GetFont(const char *pFilename) = 0;
virtual void DestroyFont(CFont *pFont) = 0;
virtual void SetDefaultFont(CFont *pFont) = 0; virtual void SetDefaultFont(CFont *pFont) = 0;
virtual void SetCurFont(CFont *pFont) = 0; virtual void SetCurFont(CFont *pFont) = 0;