Changeset 5515 in orxonox.OLD for trunk/src

Timestamp:

Nov 9, 2005, 1:16:17 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: unloading of fonts now without a Warning from the ResourceManager

Location:

trunk/src/lib/graphics/text_engine

Files:

• text.cc (modified) (2 diffs)
• text_engine.cc (modified) (1 diff)
• text_engine.h (modified) (1 diff)

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

@@ -49 +49 @@
 Text::~Text()
 {
-  if (this->font != NULL)
+  if (this->font != NULL && this->font != Font::defaultFont)
     ResourceManager::getInstance()->unload(this->font);
 
@@ -89 +89 @@
 
   // unloading the Font if we alrady have one loaded.
-  if (this->font != NULL)
+  if (this->font != NULL && this->font != Font::defaultFont)
     ResourceManager::getInstance()->unload(this->font);
   this->font = NULL;

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

@@ -84 +84 @@
     while( font != NULL)
     {
-      ResourceManager::getInstance()->unload(font, RP_GAME);
+      if (likely(font != Font::getDefaultFont()))
+        ResourceManager::getInstance()->unload(font, RP_GAME);
       font = dynamic_cast<Font*>(fontIterator->nextElement());
     }

trunk/src/lib/graphics/text_engine/text_engine.h

@@ -19 +19 @@
 #include "base_object.h"
 
-#include "vector.h"
-
 // FORWARD DECLARATION
-class PNode;
-class Font;
-class Text;
 
 //! A singleton Class that operates as a Handler initializing FONTS.