Changeset 9839 in orxonox.OLD for branches/new_class_id/src/lib/graphics/text_engine/text.cc

Timestamp:

Sep 26, 2006, 6:31:56 PM (19 years ago)

Author:

bensch

Message:

Font completely ported to the new Resource-Format.
Now all the Basic Resources previously loaded from a central ResourceManager are Distributed over the Resource-Types

File:

• branches/new_class_id/src/lib/graphics/text_engine/text.cc (modified) (3 diffs)

branches/new_class_id/src/lib/graphics/text_engine/text.cc

@@ -17 +17 @@
 
 #include "text.h"
+#include "resource_font.h"
 #include "font.h"
-#include "loading/old_resource_manager.h"
 #include "debug.h"
 
@@ -29 +29 @@
  */
 Text::Text(const std::string& fontFile, unsigned int textSize)
-    // : _font(fontFile, FONT_DEFAULT_RENDER_SIZE)
+// : _font(fontFile, FONT_DEFAULT_RENDER_SIZE)
 {
   this->registerObject(this, Text::_objectList);
 
   // initialize this Text
-  this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
+  if (!fontFile.empty())
+    this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
+  else
+    this->setFont("fonts/final_frontier.ttf", FONT_DEFAULT_RENDER_SIZE);
   this->_size = textSize;
   this->setSizeY2D(textSize);
@@ -170 +173 @@
 void Text::setFont(const std::string& fontFile, unsigned int fontSize)
 {
-  Font* newFont = NULL;
-  //  Font* oldFont = this->_font;
-
-  // load a new Font
-  if (!fontFile.empty())
-  {
-    newFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize);
-    if (newFont == NULL)
-    {
-      //      newFont = &Font::();
-      PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile.c_str());
-    }
-  }
-
-  if (newFont == NULL)
-    this->_font = Font();
-  else
-    this->_font = *newFont;
+  this->_font = ResourceFont(fontFile, fontSize);
 
   this->setupTextWidth();