sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a Library to most reference-counted classes

Browse Source 
Former-commit-id: 3ed409a71dcd5ce4eec7672ac26f8fff00e3b136
This commit is contained in:
Lynix
2015-01-28 18:06:05 +01:00
parent e18e490c59
commit 53162c1722
34 changed files with 438 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Nazara/Utility/Font.cpp
View File

@@ -363,15 +363,6 @@ unsigned int NzFont::GetDefaultMinimumStepSize()
return s_defaultMinimumStepSize;
}
bool NzFont::Initialize()
{
s_defaultAtlas.reset(new NzGuillotineImageAtlas);
s_defaultGlyphBorder = 1;
s_defaultMinimumStepSize = 1;
return true;
}
void NzFont::SetDefaultAtlas(const std::shared_ptr<NzAbstractAtlas>& atlas)
{
s_defaultAtlas = atlas;
@@ -395,12 +386,6 @@ void NzFont::SetDefaultMinimumStepSize(unsigned int minimumStepSize)
s_defaultMinimumStepSize = minimumStepSize;
}
void NzFont::Uninitialize()
{
s_defaultAtlas.reset();
s_defaultFont.Reset();
}
nzUInt64 NzFont::ComputeKey(unsigned int characterSize, nzUInt32 style) const
{
// On prend le pas en compte
@@ -573,8 +558,31 @@ const NzFont::Glyph& NzFont::PrecacheGlyph(GlyphMap& glyphMap, unsigned int char
return glyph;
}
bool NzFont::Initialize()
{
if (!NzFontLibrary::Initialize())
{
NazaraError("Failed to initialise library");
return false;
}
s_defaultAtlas.reset(new NzGuillotineImageAtlas);
s_defaultGlyphBorder = 1;
s_defaultMinimumStepSize = 1;
return true;
}
void NzFont::Uninitialize()
{
s_defaultAtlas.reset();
s_defaultFont.Reset();
NzFontLibrary::Uninitialize();
}
std::shared_ptr<NzAbstractAtlas> NzFont::s_defaultAtlas;
NzFontRef NzFont::s_defaultFont;
NzFontLibrary::LibraryMap NzFont::s_library;
NzFontLoader::LoaderList NzFont::s_loaders;
unsigned int NzFont::s_defaultGlyphBorder;
unsigned int NzFont::s_defaultMinimumStepSize;