Changeset 8753 in orxonox.OLD for branches/fontdata/src/lib/graphics/text_engine/text.cc

Timestamp:

Jun 23, 2006, 6:38:05 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: non-compiling new Version of the Data-Font

File:

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

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

@@ -56 +56 @@
 Text::~Text()
 {
-  if (this->_font != NULL && this->_font != Font::getDefaultFont())
-    ResourceManager::getInstance()->unload(this->_font);
+/*  if (this->_font != NULL && this->_font != Font::getDefaultFont())
+    ResourceManager::getInstance()->unload(this->_font);*/
 }
 
@@ -175 +175 @@
 {
   Font* newFont = NULL;
-  Font* oldFont = this->_font;
+//  Font* oldFont = this->_font;
 
   // load a new Font
@@ -183 +183 @@
     if (newFont == NULL)
     {
-      newFont = Font::getDefaultFont();
+      //      newFont = Font::getDefaultFont();
       PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile.c_str());
     }
   }
-  if (newFont == NULL)
-    newFont = Font::getDefaultFont();
+//  if (newFont == NULL)
+//    newFont = Font::getDefaultFont();
   assert(newFont != NULL);
 
   // unloading the Font if we alrady have one loaded.
   this->_font = newFont;
-  if (oldFont != NULL && oldFont != Font::getDefaultFont())
-    ResourceManager::getInstance()->unload(oldFont);
+//   if (oldFont != NULL && oldFont != Font::getDefaultFont())
+//     ResourceManager::getInstance()->unload(oldFont);
 
   this->setupTextWidth();