Changeset 3754 in orxonox.OLD for orxonox/branches/textEngine/src/story_entities

Timestamp:

Apr 8, 2005, 12:01:13 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: taken out the fontSet

Location:

orxonox/branches/textEngine/src/story_entities

Files:

• world.cc (modified) (3 diffs)
• world.h (modified) (2 diffs)

orxonox/branches/textEngine/src/story_entities/world.cc

@@ -38 +38 @@
 #include "command_node.h"
 #include "glmenu_imagescreen.h"
-#include "fontset.h"
 #include "glfont.h"
 #include "list.h"
@@ -201 +200 @@
     {
       // initializing Font
-      testFont = new FontSet();
-      testFont->buildFont("../data/pictures/font.tga");
-      tmpFont = new GLFont("../data/fonts/dark_crystal.ttf");
+      tmpFont = new GLFont("../data/fonts/earth.ttf");
       this->glmis->step();
       // initializing the TrackManager
@@ -595 +592 @@
   skySphere->draw();
 
-  testFont->printText(0, 0, 1, "orxonox_" PACKAGE_VERSION);
   tmpFont->draw();
 

orxonox/branches/textEngine/src/story_entities/world.h

@@ -21 +21 @@
 class Skysphere;
 class LightManager;
-class FontSet;
 class GLFont;
 class Terrain;
@@ -96 +95 @@
   bool bPause;                  //!< pause mode
 
-  FontSet* testFont;            //!< A test Font. \todo fix this, so it is for real.
   GLFont* tmpFont;              //!< tmpFont \todo fix
   GLMenuImageScreen* glmis;     //!< The Level-Loader Display