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

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

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

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

@@ -33 +33 @@
 
 #include "graphics_engine.h"
-#include "util/loading/resource_manager.h"
-#include "class_list.h"
 
 #include "debug.h"
@@ -40 +38 @@
 /// TEXT-ENGINE ///
 ///////////////////
+ObjectListDefinition(TextEngine);
 /**
  *  standard constructor
@@ -45 +44 @@
 TextEngine::TextEngine ()
 {
-   this->setClassID(CL_TEXT_ENGINE, "TextEngine");
-   this->setName("TextEngine");
-   this->enableFonts();
+  this->registerObject(this, TextEngine::_objectList);
+  this->setName("TextEngine");
+  this->enableFonts();
 }
 
@@ -62 +61 @@
 {
   // first remove all the remaining Texts (if any).
-  const std::list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
-  if (textList != NULL)
-  {
-    while(textList->size() > 0)
-      delete dynamic_cast<Text*>(textList->front());
-  }
+  while (!Text::objectList().empty())
+    delete Text::objectList().front();
   // delete all remaining fonts (There should not be Anything to do here)
-  const std::list<BaseObject*>* fontList = ClassList::getList(CL_FONT);
-  if (fontList != NULL)
+
+  //const std::list<BaseObject*>* fontList = ClassList::getList(CL_FONT);
+  //if (fontList != NULL)
   {
     ///FIXME
-//    while (fontList->size() > 0)
+    //    while (fontList->size() > 0)
     {
-//      Font* font = dynamic_cast<Font*>(fontList->back());
+      //      Font* font = dynamic_cast<Font*>(fontList->back());
       //if (likely(font != Font::getDefaultFont()))
       //        ResourceManager::getInstance()->unload(font, RP_GAME);
@@ -91 +87 @@
 {
   if (!TTF_WasInit())
-    {
-      if(TTF_Init()==-1)
-        PRINTF(1)("TTF_Init: %s\n", TTF_GetError());
+  {
+    if(TTF_Init()==-1)
+      PRINTF(1)("TTF_Init: %s\n", TTF_GetError());
 
-      TextEngine::checkVersion();
-    }
+    TextEngine::checkVersion();
+  }
   else
     PRINTF(4)("Fonts already initialized\n");
@@ -107 +103 @@
 {
   if (TTF_WasInit())
-    {
-//      Font::removeDefaultFont();
-      TTF_Quit();
-    }
+  {
+    //      Font::removeDefaultFont();
+    TTF_Quit();
+  }
   else
     PRINTF(4)("Fonts were not initialized.\n");
@@ -122 +118 @@
 void TextEngine::debug() const
 {
-  const std::list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
-  if (textList != NULL)
+  PRINT(0)("+-------------------------------+\n");
+  PRINT(0)("+ TEXT ENGINE DEBUG INFORMATION +\n");
+  PRINT(0)("+-------------------------------+\n");
+  PRINT(0)("Reference: %p; Text Counts: %d\n", this, Text::objectList().size());
+
+  for (ObjectList<Text>::const_iterator it = Text::objectList().begin();
+       it != Text::objectList().end();
+       ++it)
   {
-    PRINT(0)("+-------------------------------+\n");
-    PRINT(0)("+ TEXT ENGINE DEBUG INFORMATION +\n");
-    PRINT(0)("+-------------------------------+\n");
-    PRINT(0)("Reference: %p; Text Counts: %d\n", this, textList->size());
-
-    std::list<BaseObject*>::const_iterator text;
-    for ( text = textList->begin(); text != textList->end(); text++)
-      dynamic_cast<Text*>(*text)->debug();
+      (*it)->debug();
     PRINT(0)("+---------------------------TE--+\n");
   }
@@ -152 +147 @@
       compile_version.minor == link_version.minor &&
       compile_version.patch == link_version.patch)
-    {
-      return true;
-    }
+  {
+    return true;
+  }
   else
-    {
-      PRINTF(2)("compiled with SDL_ttf version: %d.%d.%d\n",
-                compile_version.major,
-                compile_version.minor,
-                compile_version.patch);
+  {
+    PRINTF(2)("compiled with SDL_ttf version: %d.%d.%d\n",
+              compile_version.major,
+              compile_version.minor,
+              compile_version.patch);
 
-      PRINTF(2)("running with SDL_ttf version: %d.%d.%d\n",
-                link_version.major,
-                link_version.minor,
-                link_version.patch);
-      return false;
-    }
+    PRINTF(2)("running with SDL_ttf version: %d.%d.%d\n",
+              link_version.major,
+              link_version.minor,
+              link_version.patch);
+    return false;
+  }
 }