Changeset 5344 in orxonox.OLD for trunk/src/lib/graphics/text_engine/text.cc

Timestamp:

Oct 10, 2005, 12:39:21 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new Way to load and unload Text

File:

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

trunk/src/lib/graphics/text_engine/text.cc

@@ -38 +38 @@
   if (fontFile != NULL)
     this->setFont(fontFile, fontSize);
-  this->setType(type);
-}
-
-/**
- *  creates a new Text Element
- * @param font the Font to render this text in
- * @param type The renderType to display this font in
- *
- * this constructor is private, because the user should initialize
- * a text with the TextEngine.
- */
-Text::Text(Font* font, TEXT_RENDER_TYPE type)
-{
-  this->init();
-
-  this->font = font;
   this->setType(type);
 }
@@ -89 +73 @@
 
 /**
- * sets the Font of this Text to font
- * @param font the Font (normaly from the ResourceManager) to allocate to this Text
- */
-void Text::setFont(Font* font)
-{
-  if (this->font != NULL)
-    ResourceManager::getInstance()->unload(this->font);
-  this->font = font;
-}
-
-/**
  * sets the Font of this Text to font from fontFile
  * @param fontFile the File to load the Font from.
@@ -111 +84 @@
 
   tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);
-  if (tmpFont == NULL)
+  if (tmpFont != NULL)
+  {
+    if (this->font != NULL)
+      ResourceManager::getInstance()->unload(this->font);
+    this->font = tmpFont;
+  }
+
+  else
   {
     PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile);
-    this->setFont(NULL);
-  }
-  else
-    this->setFont(tmpFont);
+    if (this->font != NULL)
+      ResourceManager::getInstance()->unload(this->font);
+    this->font = NULL;
+  }
 }