Use a mono font for the console text

This makes the console text more readable, as its case is quite important
and the original font uses small capital letters for lower case, which are
hard to read.

The font used is Libration Mono with height 32 and some antialiasing.
Bitmap font generated with CBFG. Liberation Mono is under the SIL Open
Font License version 1.1.

Part of #23.

diff --git a/Data/Textures/FontMono.png b/Data/Textures/FontMono.png
new file mode 100644 (file)
index 0000000..3d46b45
Binary files /dev/null and b/Data/Textures/FontMono.png differ

diff --git a/Source/Game.cpp b/Source/Game.cpp
index c38567497e5a1d9226186b939dc4c622e656d70a..0fe8e53fea2da730f42650ce8bf25e8d05cf28f5 100644 (file)
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -90,6 +90,7 @@ XYZ mapcenter;
 float mapradius = 0;
 
 Text *text = NULL;
+Text *textmono = NULL;
 float fps = 0;
 
 bool editorenabled = 0;

diff --git a/Source/Game.hpp b/Source/Game.hpp
index 0dcee30ea483ab7778362cb009228c09d8bdf1ac..17e188ab019bf2182cf06983746811cdc8f6b9e2 100644 (file)
--- a/Source/Game.hpp
+++ b/Source/Game.hpp
@@ -98,6 +98,7 @@ extern XYZ mapcenter;
 extern float mapradius;
 
 extern Text *text;
+extern Text *textmono;
 extern float fps;
 
 extern bool editorenabled;

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 9ceac00218bb39186a2360d65afa3499c2b44c5f..8bbeb349c208acb93d22bf39ea01ce5c813508d7 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -1553,12 +1553,12 @@ int Game::DrawGLScene(StereoSide side)
             int offset = 0;
             if (consoleselected >= 60)
                 offset = consoleselected - 60;
-            text->glPrint(10, 30, " ]", 0, 1, 1024, 768);
+            textmono->glPrint(10, 30, " ]", 0, 1, 1024, 768);
             if (consoleblink) {
-                text->glPrint(30 + (float)(consoleselected) * 10 - offset * 10, 30, "_", 0, 1, 1024, 768);
+                textmono->glPrint(30 + (float)(consoleselected) * 10 - offset * 10, 30, "_", 0, 1, 1024, 768);
             }
             for (unsigned i = 0; i < 15; i++) {
-                text->glPrint(30 - offset * 10, 30 + i * 20, consoletext[i], 0, 1, 1024, 768);
+                textmono->glPrint(30 - offset * 10, 30 + i * 20, consoletext[i], 0, 1, 1024, 768);
             }
         }
     }

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index 525b5227663e51bada5bc6bbdb1e6f4a20f97b6b..2922eaf29e312c4b989eb3580d522f1790cb4397 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -105,15 +105,15 @@ void Dispose()
 void Game::newGame()
 {
     text = new Text();
+    textmono = new Text();
     skybox = new SkyBox();
 }
 
 void Game::deleteGame()
 {
-    if (skybox)
-        delete skybox;
-    if (text)
-        delete text;
+    delete skybox;
+    delete text;
+    delete textmono;
 
     glDeleteTextures(1, &screentexture);
     glDeleteTextures(1, &screentexture2);
@@ -538,6 +538,8 @@ void Game::InitGame()
     texdetail = 1;
     text->LoadFontTexture("Textures/Font.png");
     text->BuildFont();
+    textmono->LoadFontTexture("Textures/FontMono.png");
+    textmono->BuildFont();
     texdetail = temptexdetail;
 
     FadeLoadingScreen(10);
@@ -639,6 +641,8 @@ void Game::LoadStuff()
     texdetail = 1;
     text->LoadFontTexture("Textures/Font.png");
     text->BuildFont();
+    textmono->LoadFontTexture("Textures/FontMono.png");
+    textmono->BuildFont();
     texdetail = temptexdetail;
 
     viewdistdetail = 2;