From 77db6f5dd3927073d0506bda6e56a953e09e3529 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sat, 17 Jan 2015 22:11:29 +0100
Subject: [PATCH] Added Font initializer

Former-commit-id: 9d64e5f28508ebfafe7504a9ba47f57a970e77ce
---
 include/Nazara/Utility/Font.hpp |  5 +++++
 src/Nazara/Utility/Font.cpp     | 17 +++++++++++++++--
 src/Nazara/Utility/Utility.cpp  |  8 ++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/include/Nazara/Utility/Font.hpp b/include/Nazara/Utility/Font.hpp
index d28c04df4..c0bc61a40 100644
--- a/include/Nazara/Utility/Font.hpp
+++ b/include/Nazara/Utility/Font.hpp
@@ -76,9 +76,14 @@ class NAZARA_API NzFont : public NzResource, NzAbstractAtlas::Listener, NzNonCop
 
 		static unsigned int GetDefaultGlyphBorder();
 		static unsigned int GetDefaultMinimumStepSize();
+
+		static bool Initialize();
+
 		static void SetDefaultGlyphBorder(unsigned int borderSize);
 		static void SetDefaultMinimumStepSize(unsigned int minimumSizeStep);
 
+		static void Uninitialize();
+
 		enum ModicationCode
 		{
 			ModificationCode_AtlasChanged,
diff --git a/src/Nazara/Utility/Font.cpp b/src/Nazara/Utility/Font.cpp
index 6dfd0cf1f..f896c8674 100644
--- a/src/Nazara/Utility/Font.cpp
+++ b/src/Nazara/Utility/Font.cpp
@@ -328,6 +328,14 @@ unsigned int NzFont::GetDefaultMinimumStepSize()
 	return s_defaultMinimumSizeStep;
 }
 
+bool NzFont::Initialize()
+{
+	s_defaultGlyphBorder = 1;
+	s_defaultMinimumSizeStep = 1;
+
+	return true;
+}
+
 void NzFont::SetDefaultGlyphBorder(unsigned int borderSize)
 {
 	s_defaultGlyphBorder = borderSize;
@@ -346,6 +354,11 @@ void NzFont::SetDefaultMinimumStepSize(unsigned int minimumSizeStep)
 	s_defaultMinimumSizeStep = minimumSizeStep;
 }
 
+void NzFont::Uninitialize()
+{
+
+}
+
 nzUInt64 NzFont::ComputeKey(unsigned int characterSize, nzUInt32 style) const
 {
 	// 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;
-unsigned int NzFont::s_defaultGlyphBorder = 1;
-unsigned int NzFont::s_defaultMinimumSizeStep = 1;
+unsigned int NzFont::s_defaultGlyphBorder;
+unsigned int NzFont::s_defaultMinimumSizeStep;
diff --git a/src/Nazara/Utility/Utility.cpp b/src/Nazara/Utility/Utility.cpp
index c12459277..04f7af2c2 100644
--- a/src/Nazara/Utility/Utility.cpp
+++ b/src/Nazara/Utility/Utility.cpp
@@ -12,6 +12,7 @@
 #include <Nazara/Core/Thread.hpp>
 #include <Nazara/Utility/Buffer.hpp>
 #include <Nazara/Utility/Config.hpp>
+#include <Nazara/Utility/Font.hpp>
 #include <Nazara/Utility/Loaders/FreeType.hpp>
 #include <Nazara/Utility/Loaders/MD2.hpp>
 #include <Nazara/Utility/Loaders/MD5Anim.hpp>
@@ -49,6 +50,12 @@ bool NzUtility::Initialize()
 		return false;
 	}
 
+	if (!NzFont::Initialize())
+	{
+		NazaraError("Failed to initialize fonts");
+		return false;
+	}
+
 	if (!NzPixelFormat::Initialize())
 	{
 		NazaraError("Failed to initialize pixel formats");
@@ -123,6 +130,7 @@ void NzUtility::Uninitialize()
 	NzWindow::Uninitialize();
 	NzVertexDeclaration::Uninitialize();
 	NzPixelFormat::Uninitialize();
+	NzFont::Uninitialize();
 	NzBuffer::Uninitialize();
 
 	NazaraNotice("Uninitialized: Utility module");