From 710d3e2509751676d81743c30b40c4a6a09b34d3 Mon Sep 17 00:00:00 2001
From: "Martin Felis (berta)" <martin@silef.de>
Date: Sun, 2 May 2010 22:39:49 +0200
Subject: [PATCH] improved font handling and HUD

---
 asteroids/MenuOverlay.cc       |  23 +++++++--
 asteroids/MenuOverlay.h        |   3 ++
 asteroids/Model.cc             |  12 +++--
 asteroids/Model.h              |   3 ++
 asteroids/View.cc              |   1 +
 data/fonts/AldotheApache.ttf   | Bin 0 -> 17092 bytes
 data/fonts/fonts.txt           |   3 ++
 engine/SimpleConsoleOverlay.cc |   2 +
 engine/ViewBase.cc             |  88 +++++++++++++++++++++++++++------
 engine/ViewBase.h              |  20 +++++++-
 engine/ViewBaseGlobal.h        |   1 +
 11 files changed, 132 insertions(+), 24 deletions(-)
 create mode 100644 data/fonts/AldotheApache.ttf
 create mode 100644 data/fonts/fonts.txt

diff --git a/asteroids/MenuOverlay.cc b/asteroids/MenuOverlay.cc
index 8a0fd66..2961b44 100644
--- a/asteroids/MenuOverlay.cc
+++ b/asteroids/MenuOverlay.cc
@@ -8,6 +8,7 @@
 #include "OverlayBase.h"
 #include "MenuOverlay.h"
 #include "Model.h"
+#include "View.h"
 #include "Sprite.h"
 #include "ShipEntity.h"
 
@@ -24,6 +25,11 @@ void MenuOverlay::Init () {
 	if (!mShipSprite.LoadFromPNG("./data/textures/ship.png"))
 		Engine::LogError ("Could not load ship sprite!");
 
+	// setup of the HUD font
+	mView->LoadFont ("AldotheApache.ttf", 20);
+	mView->SelectFont ("AldotheApache.ttf");
+	mView->SetFontJustification (Engine::FontJustificationRight);
+
 	assert (mShipSprite.GetWidth() > 1);
 	mShipSprite.SetScale (0.1);
 }
@@ -110,6 +116,8 @@ void MenuOverlay::Draw () {
 	glPushMatrix ();
 	glLoadIdentity ();
 
+	mView->SelectFont("console.ttf");
+
 	// then we do the drawings
 	if (mModel->GetGameState() == GameStateRunning) {
 		glClearColor (0., 0., 0., 1.);
@@ -137,10 +145,17 @@ void MenuOverlay::DrawGameRunning() {
 	right = static_cast<float> (Engine::GetWindowWidth());
 	bottom = static_cast<float> (Engine::GetWindowHeight());
 
-	int i;
-	for (i = 0; i < mModel->GetPlayerLives(); i++) {
-		mShipSprite.DrawAt2D (right - 32 - i*20, bottom - 16);
-	}
+	mView->SelectFont ("AldotheApache.ttf");
+
+	std::ostringstream out_stream;
+	out_stream << mModel->GetPlayerLives() << " x ";
+	mView->DrawGLString (right - 64, bottom - 20, out_stream.str().c_str()); 
+
+	mShipSprite.DrawAt2D (right - 32 - 10, bottom - 16);
+
+	out_stream.str("");
+	out_stream << mModel->GetPoints();
+	mView->DrawGLString (right - 10, 40, out_stream.str().c_str()); 
 }
 
 void MenuOverlay::DrawPlayerDied () {
diff --git a/asteroids/MenuOverlay.h b/asteroids/MenuOverlay.h
index 2f4cd27..e6f0bb4 100644
--- a/asteroids/MenuOverlay.h
+++ b/asteroids/MenuOverlay.h
@@ -11,6 +11,7 @@ class OverlayBase;
 namespace asteroids {
 
 class Model;
+class View;
 
 class MenuOverlay : public Engine::OverlayBase {
 	public:
@@ -30,9 +31,11 @@ class MenuOverlay : public Engine::OverlayBase {
 		void DrawPlayerDied ();
 
 		void SetModel (Model *model) { mModel = model; };
+		void SetView (View *view) { mView = view; };
 
 	private:
 		Model *mModel;
+		View *mView;
 		Engine::Sprite mShipSprite;
 };
 
diff --git a/asteroids/Model.cc b/asteroids/Model.cc
index 141c5fb..95fa5df 100644
--- a/asteroids/Model.cc
+++ b/asteroids/Model.cc
@@ -9,6 +9,7 @@
 
 #include "EntityFactory.h"
 #include "AsteroidsEvents.h"
+#include "AsteroidEntity.h"
 
 #include <assert.h>
 
@@ -56,6 +57,7 @@ void Model::Process () {
 	if (mLastGameState == GameStateMainMenu && mGameState == GameStateRunning) {
 		mPlayerLives = 3;
 		mCurrentLevelIndex = 0;
+		mPoints = 0;
 		DoLoadLevel (mLevelList[mCurrentLevelIndex].c_str());
 	}
 	else if (mLastGameState == GameStateRunning && mGameState == GameStatePlayerDied) {
@@ -75,8 +77,7 @@ void Model::Process () {
 		}
 	}
 	else if (mLastGameState == GameStatePlayerDied && mGameState == GameStateRunning)
-		// DoLoadLevel (mLevelPath);
-		assert (0);
+		DoLoadLevel(mLevelList[mCurrentLevelIndex].c_str());
 	else if (mLastGameState == GameStateRunning && mGameState == GameStateGameOver)
 		ClearEntities();
 
@@ -105,13 +106,14 @@ unsigned int Model::InitLevelList () {
 		Engine::LogError ("Could not init level list: %s is not a directory!");
 	}
 
-
 	boost::filesystem::directory_iterator end_iter;
 	for (boost::filesystem::directory_iterator dir_iter(level_dir);
 			dir_iter != end_iter;
 			++dir_iter) {
 		if (boost::filesystem::is_regular_file (dir_iter->status())) {
-			mLevelList.push_back (std::string(level_dir_name) + dir_iter->path().filename());
+			std::string level_relative_path (level_dir_name);
+			level_relative_path += dir_iter->path().filename();
+			mLevelList.push_back (level_relative_path);
 			Engine::LogDebug ("Found level %s", mLevelList[mLevelList.size()-1].c_str());
 		}
 	}
@@ -248,6 +250,8 @@ void Model::OnKillEntity (const Engine::EntityBase *entity) {
 
 	if (entity_type == GameEntityTypeAsteroid) {
 		unsigned int i;
+		const AsteroidEntity *asteroid = static_cast<const AsteroidEntity*>(entity);
+		mPoints += 150 + asteroid->mSubAsteroidsCount * 75;
 
 		for (i = 0; i < mAsteroids.size(); i++) {
 			if (mAsteroids.at(i) == entity->mId) {
diff --git a/asteroids/Model.h b/asteroids/Model.h
index f916ce9..ac790f3 100644
--- a/asteroids/Model.h
+++ b/asteroids/Model.h
@@ -21,6 +21,7 @@ class Model : public Engine::ModelBase {
 		GameState GetGameState () { return mGameState; };
 
 		int GetPlayerLives () { return mPlayerLives; };
+		unsigned int GetPoints () { return mPoints; };
 
 		float GetWorldWidth ();
 		float GetWorldHeight ();
@@ -31,6 +32,7 @@ class Model : public Engine::ModelBase {
 		virtual void OnDestroy() {
 			Engine::ModelBase::OnDestroy();
 			mAsteroids.clear();
+			mLevelList.clear();
 			delete mLevelCompleteEventHandler;
 		};
 		virtual void OnRegisterCommands ();
@@ -48,6 +50,7 @@ class Model : public Engine::ModelBase {
 		GameState mLastGameState;
 
 		int mPlayerLives;
+		unsigned int mPoints;
 		std::vector<std::string> mLevelList;
 		unsigned int mCurrentLevelIndex;
 
diff --git a/asteroids/View.cc b/asteroids/View.cc
index e8c8974..3abc3d3 100644
--- a/asteroids/View.cc
+++ b/asteroids/View.cc
@@ -32,6 +32,7 @@ int View::OnInit (int argc, char* argv[]) {
 	// We want menu
 	mMenuOverlay = boost::shared_ptr<MenuOverlay> (new MenuOverlay);
 	mMenuOverlay->SetModel ((Model*) mModel);
+	mMenuOverlay->SetView (this);
 	mMenuOverlay->Init();
 	AddOverlay (mMenuOverlay);
 
diff --git a/data/fonts/AldotheApache.ttf b/data/fonts/AldotheApache.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4328d879ca68e6d9bf4f1d4ae5243d2bf1e9ff82
GIT binary patch
literal 17092
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
QaSkzu9jO+P199Qs0jV3regFUf

literal 0
HcmV?d00001

diff --git a/data/fonts/fonts.txt b/data/fonts/fonts.txt
new file mode 100644
index 0000000..be3f9cb
--- /dev/null
+++ b/data/fonts/fonts.txt
@@ -0,0 +1,3 @@
+AldotheApache.ttf from http://ajpaglia.com/
+SamsTown.ttf from http://www.dafont.com/sams-town.font
+console.ttf
diff --git a/engine/SimpleConsoleOverlay.cc b/engine/SimpleConsoleOverlay.cc
index f4bef21..2f40ad0 100644
--- a/engine/SimpleConsoleOverlay.cc
+++ b/engine/SimpleConsoleOverlay.cc
@@ -75,6 +75,8 @@ bool SimpleConsoleOverlay::OnKeyDown (const SDL_keysym &keysym) {
 }
 
 void SimpleConsoleOverlay::Draw () {
+	SelectFont ("console.ttf");
+
 	// we switch to orthographic projection and draw the contents of the 2d 
 	// overlay on top of the previous drawings
 	glMatrixMode (GL_PROJECTION);
diff --git a/engine/ViewBase.cc b/engine/ViewBase.cc
index 23384bb..902595a 100644
--- a/engine/ViewBase.cc
+++ b/engine/ViewBase.cc
@@ -52,19 +52,14 @@ int ViewBase::OnInit (int argc, char* argv[]) {
 
 	InitGL ();
 	Resize (mWindowWidth, mWindowHeight);
-
-	mConsoleFont = new OGLFT::Monochrome ("./data/fonts/console.ttf", 12);
-
-	if ( mConsoleFont == 0 || !mConsoleFont->isValid() ) {
-		LogError ("Could not load font %s!", "./data/fonts/console.ttf");
-		exit (-1);
-	}
+	
+	LoadFont ("console.ttf");
+	mCurrentFont = mFonts["console.ttf"];
+	SetFontColor (1., 1., 1.);
 
 	OverlayBasePtr console_overlay(new SimpleConsoleOverlay);
 	AddOverlay (console_overlay);
 
-	mConsoleFont->setForegroundColor (1., 1., 1.);
-
 	mDrawAxis = false;
 
 	mDrawGrid = false;
@@ -77,13 +72,16 @@ int ViewBase::OnInit (int argc, char* argv[]) {
 }
 
 void ViewBase::OnDestroy () {
-	if (mConsoleFont )
-		delete mConsoleFont;
-	mConsoleFont = NULL;
-
 	while (mOverlays.size() > 0)
 		mOverlays.pop_back();
 
+	std::map<std::string, OGLFT::Monochrome*>::iterator iter;
+
+	for (iter = mFonts.begin(); iter != mFonts.end(); ++iter) {
+		delete iter->second;
+	}
+	mFonts.clear();
+
 	ViewInstance = NULL;
 
 	LogDebug ("View Destroy");
@@ -189,9 +187,63 @@ void ViewBase::Draw () {
 	SDL_GL_SwapBuffers ();
 }
 
+/* Fonts */
+bool ViewBase::LoadFont (const char *font_name, float point_size) {
+	std::string font_path ("./data/fonts/");
+	font_path += font_name;
+	
+	LogDebug ("Loading font %s size %f from %s", font_name, point_size, font_path.c_str());
+
+	OGLFT::Monochrome *font = new OGLFT::Monochrome (font_path.c_str(), point_size);
+	if ( font == 0 || !font->isValid() ) {
+		LogError ("Could not load font %s!", font_path.c_str());
+	}
+	font->setForegroundColor(1., 1., 1.);
+
+	mFonts.insert(std::make_pair<std::string, OGLFT::Monochrome*>(font_name, font));
+}
+
+void ViewBase::SelectFont (const char *font) {
+	std::map<std::string, OGLFT::Monochrome*>::iterator font_iter;
+
+	font_iter = mFonts.find(font);
+
+	if (font_iter != mFonts.end()) {
+		mCurrentFont = font_iter->second;
+		return;
+	}
+
+	LogDebug ("Font %s not found, trying to load it", font);
+	if (LoadFont (font)) {
+		font_iter = mFonts.find(font);
+
+		assert (mFonts.find(font) != mFonts.end());
+
+		mCurrentFont = font_iter->second;
+
+		return;
+	}
+
+	LogError("Error trying to load font %s", font);
+}
+
+void ViewBase::SetFontJustification (FontJustification justification) {
+	if (justification == FontJustificationRight)
+		mCurrentFont->setHorizontalJustification(OGLFT::Face::RIGHT);
+	else if (justification == FontJustificationCenter) 
+		mCurrentFont->setHorizontalJustification(OGLFT::Face::CENTER);
+	else mCurrentFont->setHorizontalJustification(OGLFT::Face::LEFT);
+
+}
+
+void ViewBase::SetFontColor (float r, float g, float b) {
+	assert (mCurrentFont);
+	mCurrentFont->setForegroundColor(r, g, b);
+};
+
 void ViewBase::DrawGLString (float x, float y, const char* str) {
 	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
-	mConsoleFont->draw (x, y, str);
+	mCurrentFont->draw (x, y, str);
 }
 
 void ViewBase::GetCamereEye (float *eye_out) {
@@ -310,6 +362,14 @@ void DrawGLString (float x, float y, const char* str) {
 	ViewInstance->DrawGLString (x, y, str);
 }
 
+void SelectFont (const char* font) {
+	if (!ViewInstance) {
+		LogError ("Cannot select font: View not yet initialized!");
+		return;
+	}
+	ViewInstance->SelectFont(font);
+}
+
 unsigned int GetWindowWidth() {
 	return ViewInstance->GetWindowWidth ();
 }
diff --git a/engine/ViewBase.h b/engine/ViewBase.h
index b62083f..c81d4a8 100644
--- a/engine/ViewBase.h
+++ b/engine/ViewBase.h
@@ -11,6 +11,12 @@ namespace OGLFT {
 
 namespace Engine {
 
+enum FontJustification {
+	FontJustificationRight = 0,
+	FontJustificationCenter,
+	FontJustificationLeft
+};
+
 class Module;
 class ModelBase;
 class CameraBase;
@@ -20,6 +26,7 @@ class CameraBase;
 
 class ViewBase : public Module{ 
 	public:
+		ViewBase() : mModel(NULL), mCamera(NULL), mCurrentFont(NULL) {}
 		virtual ~ViewBase() {};
 
 		/** \brief Resizes the View */
@@ -28,9 +35,15 @@ class ViewBase : public Module{
 		/** \brief Performs all drawing */
 		virtual void Draw ();
 
+		/* Fonts */
+		bool LoadFont (const char *font_name, float point_size=12);
+		void SelectFont (const char *font_name);
+		void SetFontJustification (FontJustification justification);
+		void SetFontColor (float r, float g, float b);
 		/** \brief Draws a string at the given position using current projection
 		 * and modelview matrices */
 		void DrawGLString (float x, float y, const char* str);
+
 		/** \brief Stores the eye poisition in eye_out */
 		void GetCamereEye (float *eye_out);
 
@@ -87,8 +100,11 @@ class ViewBase : public Module{
 		int mGridSizeX;
 		int mGridSizeZ;
 
-		/** \brief Font that is used in the console */
-		OGLFT::Monochrome* mConsoleFont;
+		/** \brief The font that is currently used */
+		OGLFT::Monochrome* mCurrentFont;
+
+		/** \brief Contains all the fonts that are to be used */
+		std::map<std::string, OGLFT::Monochrome*> mFonts;
 
 		friend class Engine;
 };
diff --git a/engine/ViewBaseGlobal.h b/engine/ViewBaseGlobal.h
index 6bc5295..b91af06 100644
--- a/engine/ViewBaseGlobal.h
+++ b/engine/ViewBaseGlobal.h
@@ -6,6 +6,7 @@ namespace Engine {
 /** \brief Draws the given string at the given position using the current
  * OpenGL transformations */
 void DrawGLString (float x, float y, const char* str);
+void SelectFont (const char* font);
 
 unsigned int GetWindowWidth();
 unsigned int GetWindowHeight();