mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use CStrIntern for font names to reduce lookup cost

Browse Source 
This was SVN commit r14020.
This commit is contained in:
Ykkrosh
2013-10-18 16:15:42 +00:00
parent 91169c82c7
commit 701508922f
21 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/FontManager.cpp
+8 -8
View File
@@ -26,7 +26,7 @@
#include "ps/Filesystem.h"
#include "renderer/Renderer.h"
shared_ptr<CFont> CFontManager::LoadFont(const CStrW& fontName)
shared_ptr<CFont> CFontManager::LoadFont(CStrIntern fontName)
{
FontsMap::iterator it = m_Fonts.find(fontName);
if (it != m_Fonts.end())
@@ -37,24 +37,24 @@ shared_ptr<CFont> CFontManager::LoadFont(const CStrW& fontName)
if (!ReadFont(font.get(), fontName))
{
// Fall back to default font (unless this is the default font)
if (fontName == L"sans-10")
if (fontName == str_sans_10)
font.reset();
else
font = LoadFont(L"sans-10");
font = LoadFont(str_sans_10);
}
m_Fonts[fontName] = font;
return font;
}
bool CFontManager::ReadFont(CFont* font, const CStrW& fontName)
bool CFontManager::ReadFont(CFont* font, CStrIntern fontName)
{
const VfsPath path(L"fonts/");
// Read font definition file into a stringstream
shared_ptr<u8> buf;
size_t size;
const VfsPath fntName(fontName + L".fnt");
const VfsPath fntName(fontName.string() + ".fnt");
if (g_VFS->LoadFile(path / fntName, buf, size) < 0)
{
LOGERROR(L"Failed to open font file %ls", (path / fntName).string().c_str());
@@ -66,7 +66,7 @@ bool CFontManager::ReadFont(CFont* font, const CStrW& fontName)
FNTStream >> Version;
if (Version != 101) // Make sure this is from a recent version of the font builder
{
LOGERROR(L"Font %ls has invalid version", fontName.c_str());
LOGERROR(L"Font %hs has invalid version", fontName.c_str());
return 0;
}
@@ -100,7 +100,7 @@ bool CFontManager::ReadFont(CFont* font, const CStrW& fontName)
if (Codepoint < 0 || Codepoint > 0xFFFF)
{
LOGWARNING(L"Font %ls has invalid codepoint 0x%x", fontName.c_str(), Codepoint);
LOGWARNING(L"Font %hs has invalid codepoint 0x%x", fontName.c_str(), Codepoint);
continue;
}
@@ -121,7 +121,7 @@ bool CFontManager::ReadFont(CFont* font, const CStrW& fontName)
ENSURE(font->m_Height); // Ensure the height has been found (which should always happen if the font includes an 'I')
// Load glyph texture
const VfsPath imgName(fontName + L".png");
const VfsPath imgName(fontName.string() + ".png");
CTextureProperties textureProps(path / imgName);
textureProps.SetFilter(GL_NEAREST);
if (!font->m_HasRGB)