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

Added Font initializer 

Former-commit-id: 9d64e5f28508ebfafe7504a9ba47f57a970e77ce
This commit is contained in:
Lynix 2015-01-17 22:11:29 +01:00
parent c0995d1739
commit 77db6f5dd3
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/Utility/Font.hpp
View File

@ -76,9 +76,14 @@ class NAZARA_API NzFont : public NzResource, NzAbstractAtlas::Listener, NzNonCop
static unsigned int GetDefaultGlyphBorder(); static unsigned int GetDefaultGlyphBorder();
static unsigned int GetDefaultMinimumStepSize(); static unsigned int GetDefaultMinimumStepSize();
static bool Initialize();
static void SetDefaultGlyphBorder(unsigned int borderSize); static void SetDefaultGlyphBorder(unsigned int borderSize);
static void SetDefaultMinimumStepSize(unsigned int minimumSizeStep); static void SetDefaultMinimumStepSize(unsigned int minimumSizeStep);
static void Uninitialize();
enum ModicationCode enum ModicationCode
{ {
ModificationCode_AtlasChanged, ModificationCode_AtlasChanged,

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

@ -328,6 +328,14 @@ unsigned int NzFont::GetDefaultMinimumStepSize()
return s_defaultMinimumSizeStep; return s_defaultMinimumSizeStep;
} }
bool NzFont::Initialize()
{
s_defaultGlyphBorder = 1;
s_defaultMinimumSizeStep = 1;
return true;
}
void NzFont::SetDefaultGlyphBorder(unsigned int borderSize) void NzFont::SetDefaultGlyphBorder(unsigned int borderSize)
{ {
s_defaultGlyphBorder = borderSize; s_defaultGlyphBorder = borderSize;
@ -346,6 +354,11 @@ void NzFont::SetDefaultMinimumStepSize(unsigned int minimumSizeStep)
s_defaultMinimumSizeStep = minimumSizeStep; s_defaultMinimumSizeStep = minimumSizeStep;
} }
void NzFont::Uninitialize()
{
}
nzUInt64 NzFont::ComputeKey(unsigned int characterSize, nzUInt32 style) const nzUInt64 NzFont::ComputeKey(unsigned int characterSize, nzUInt32 style) const
{ {
// On prend le pas en compte // On prend le pas en compte
@ -519,5 +532,5 @@ const NzFont::Glyph& NzFont::PrecacheGlyph(GlyphMap& glyphMap, unsigned int char
} }
NzFontLoader::LoaderList NzFont::s_loaders; NzFontLoader::LoaderList NzFont::s_loaders;
unsigned int NzFont::s_defaultGlyphBorder = 1; unsigned int NzFont::s_defaultGlyphBorder;
unsigned int NzFont::s_defaultMinimumSizeStep = 1; unsigned int NzFont::s_defaultMinimumSizeStep;

8
src/Nazara/Utility/Utility.cpp
View File

@ -12,6 +12,7 @@
#include <Nazara/Core/Thread.hpp> #include <Nazara/Core/Thread.hpp>
#include <Nazara/Utility/Buffer.hpp> #include <Nazara/Utility/Buffer.hpp>
#include <Nazara/Utility/Config.hpp> #include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/Font.hpp>
#include <Nazara/Utility/Loaders/FreeType.hpp> #include <Nazara/Utility/Loaders/FreeType.hpp>
#include <Nazara/Utility/Loaders/MD2.hpp> #include <Nazara/Utility/Loaders/MD2.hpp>
#include <Nazara/Utility/Loaders/MD5Anim.hpp> #include <Nazara/Utility/Loaders/MD5Anim.hpp>
@ -49,6 +50,12 @@ bool NzUtility::Initialize()
return false; return false;
} }
if (!NzFont::Initialize())
{
NazaraError("Failed to initialize fonts");
return false;
}
if (!NzPixelFormat::Initialize()) if (!NzPixelFormat::Initialize())
{ {
NazaraError("Failed to initialize pixel formats"); NazaraError("Failed to initialize pixel formats");
@ -123,6 +130,7 @@ void NzUtility::Uninitialize()
NzWindow::Uninitialize(); NzWindow::Uninitialize();
NzVertexDeclaration::Uninitialize(); NzVertexDeclaration::Uninitialize();
NzPixelFormat::Uninitialize(); NzPixelFormat::Uninitialize();
NzFont::Uninitialize();
NzBuffer::Uninitialize(); NzBuffer::Uninitialize();
NazaraNotice("Uninitialized: Utility module"); NazaraNotice("Uninitialized: Utility module");