Merged LoadFont/GetFont

.gitignore

@@ -8,6 +8,6 @@ Release/
 *.xccheckout
 *.stackdump
 .vs
-Chapter15/Assets/Saved.gplevel
-Chapter15/Assets/*.bin
+Chapter14/Assets/Saved.gplevel
+Chapter14/Assets/*.bin
 External/FMOD

Chapter11/Game.cpp

@@ -292,7 +292,6 @@ void Game::GenerateOutput()
 
 void Game::LoadData()
 {
-	LoadFont("Assets/Carlito-Regular.ttf");
 	// Load English text
 	LoadText("Assets/English.gptext");
 
@@ -349,7 +348,6 @@ void Game::LoadData()
 	// UI elements
 	mHUD = new HUD(this);
 	
-
 	// Start music
 	mMusicEvent = mAudioSystem->PlayEvent("event:/Music");
 
@@ -455,20 +453,6 @@ void Game::PushUI(UIScreen* screen)
 	mUIStack.emplace_back(screen);
 }
 
-void Game::LoadFont(const std::string& fileName)
-{
-	Font* font = new Font(this);
-	if (font->Load(fileName))
-	{
-		mFonts.emplace(fileName, font);
-	}
-	else
-	{
-		font->Unload();
-		delete font;
-	}
-}
-
 Font* Game::GetFont(const std::string& fileName)
 {
 	auto iter = mFonts.find(fileName);
@@ -478,7 +462,18 @@ Font* Game::GetFont(const std::string& fileName)
 	}
 	else
 	{
-		return nullptr;
+		Font* font = new Font(this);
+		if (font->Load(fileName))
+		{
+			mFonts.emplace(fileName, font);
+		}
+		else
+		{
+			font->Unload();
+			delete font;
+			font = nullptr;
+		}
+		return font;
 	}
 }
 

Chapter11/Game.h

@@ -46,7 +46,6 @@ public:
 	GameState GetState() const { return mGameState; }
 	void SetState(GameState state) { mGameState = state; }
 	
-	void LoadFont(const std::string& fileName);
 	class Font* GetFont(const std::string& fileName);
 
 	void LoadText(const std::string& fileName);

Chapter12/Game.cpp

@@ -292,7 +292,6 @@ void Game::GenerateOutput()
 
 void Game::LoadData()
 {
-	LoadFont("Assets/Carlito-Regular.ttf");
 	// Load English text
 	LoadText("Assets/English.gptext");
 
@@ -474,20 +473,6 @@ void Game::PushUI(UIScreen* screen)
 	mUIStack.emplace_back(screen);
 }
 
-void Game::LoadFont(const std::string& fileName)
-{
-	Font* font = new Font(this);
-	if (font->Load(fileName))
-	{
-		mFonts.emplace(fileName, font);
-	}
-	else
-	{
-		font->Unload();
-		delete font;
-	}
-}
-
 Font* Game::GetFont(const std::string& fileName)
 {
 	auto iter = mFonts.find(fileName);
@@ -497,10 +482,22 @@ Font* Game::GetFont(const std::string& fileName)
 	}
 	else
 	{
-		return nullptr;
+		Font* font = new Font(this);
+		if (font->Load(fileName))
+		{
+			mFonts.emplace(fileName, font);
+		}
+		else
+		{
+			font->Unload();
+			delete font;
+			font = nullptr;
+		}
+		return font;
 	}
 }
 
+
 void Game::LoadText(const std::string& fileName)
 {
 	// Clear the existing map, if already loaded

Chapter12/Game.h

@@ -46,7 +46,6 @@ public:
 	GameState GetState() const { return mGameState; }
 	void SetState(GameState state) { mGameState = state; }
 	
-	void LoadFont(const std::string& fileName);
 	class Font* GetFont(const std::string& fileName);
 
 	void LoadText(const std::string& fileName);

Chapter12/Shaders/Skinned.vert

@@ -1,9 +1,9 @@
 // ----------------------------------------------------------------
 // From Game Programming in C++ by Sanjay Madhav
 // Copyright (C) 2017 Sanjay Madhav. All rights reserved.
-//
+// 
 // Released under the BSD License
-// See LICENSE.txt for full details.
+// See LICENSE in root directory for full details.
 // ----------------------------------------------------------------
 
 // Request GLSL 3.3

Chapter13/Game.cpp

@@ -293,7 +293,6 @@ void Game::GenerateOutput()
 
 void Game::LoadData()
 {
-	LoadFont("Assets/Carlito-Regular.ttf");
 	// Load English text
 	LoadText("Assets/English.gptext");
 
@@ -503,20 +502,6 @@ void Game::PushUI(UIScreen* screen)
 	mUIStack.emplace_back(screen);
 }
 
-void Game::LoadFont(const std::string& fileName)
-{
-	Font* font = new Font(this);
-	if (font->Load(fileName))
-	{
-		mFonts.emplace(fileName, font);
-	}
-	else
-	{
-		font->Unload();
-		delete font;
-	}
-}
-
 Font* Game::GetFont(const std::string& fileName)
 {
 	auto iter = mFonts.find(fileName);
@@ -526,7 +511,18 @@ Font* Game::GetFont(const std::string& fileName)
 	}
 	else
 	{
-		return nullptr;
+		Font* font = new Font(this);
+		if (font->Load(fileName))
+		{
+			mFonts.emplace(fileName, font);
+		}
+		else
+		{
+			font->Unload();
+			delete font;
+			font = nullptr;
+		}
+		return font;
 	}
 }
 

Chapter13/Game.h

@@ -46,7 +46,6 @@ public:
 	GameState GetState() const { return mGameState; }
 	void SetState(GameState state) { mGameState = state; }
 	
-	void LoadFont(const std::string& fileName);
 	class Font* GetFont(const std::string& fileName);
 
 	void LoadText(const std::string& fileName);

Chapter13/Shaders/Skinned.vert

@@ -1,9 +1,9 @@
 // ----------------------------------------------------------------
 // From Game Programming in C++ by Sanjay Madhav
 // Copyright (C) 2017 Sanjay Madhav. All rights reserved.
-//
+// 
 // Released under the BSD License
-// See LICENSE.txt for full details.
+// See LICENSE in root directory for full details.
 // ----------------------------------------------------------------
 
 // Request GLSL 3.3