Changeset 9685 in orxonox.OLD for branches/new_class_id/src/lib/graphics/text_engine

Timestamp:

Aug 22, 2006, 1:16:23 PM (18 years ago)

Author:

bensch

Message:

adapted many classes to the new ClassID System, now comes the hard part… Scripting… then Network… wow this will be so bad :/

Location:

branches/new_class_id/src/lib/graphics/text_engine

Files:

• font.cc (modified) (2 diffs)
• font.h (modified) (1 diff)
• limited_width_text.cc (modified) (2 diffs)
• limited_width_text.h (modified) (1 diff)
• multi_line_text.cc (modified) (2 diffs)
• multi_line_text.h (modified) (1 diff)
• text.cc (modified) (3 diffs)
• text.h (modified) (1 diff)
• text_engine.cc (modified) (8 diffs)
• text_engine.h (modified) (1 diff)

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

@@ -29 +29 @@
 #include "compiler.h"
 
+NewObjectListDefinition(Font);
 
 Font::Font()
@@ -130 +131 @@
   this->setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-  this->setClassID(CL_FONT, "Font");
+  this->registerObject(this, Font::_objectList);
   if (Font::defaultFontData.get() == NULL)
   {

branches/new_class_id/src/lib/graphics/text_engine/font.h

@@ -19 +19 @@
 class Font : public Material
 {
+  NewObjectListDeclaration(Font);
 
 public:

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

@@ -19 +19 @@
 #include "font.h"
 
+NewObjectListDefinition(LimitedWidthText);
 /**
  * @brief creates a new Text Element
@@ -27 +28 @@
     : Text(fontFile, textSize)
 {
-  this->setClassID(CL_LIMITED_WIDTH_TEXT, "LimitedWidthText");
+  this->registerObject(this, LimitedWidthText::_objectList);
 
   this->_dotsPosition = End;

branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.h

@@ -14 +14 @@
 class LimitedWidthText : public Text
 {
+  NewObjectListDeclaration(LimitedWidthText);
   public:
     typedef enum {

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

@@ -19 +19 @@
 #include "font.h"
 
+NewObjectListDefinition(MultiLineText);
+
 /**
  * @brief creates a new Text Element
@@ -27 +29 @@
   : Text(fontFile, textSize)
 {
-  this->setClassID(CL_MULTI_LINE_TEXT, "MultiLineText");
+  this->registerObject(this, MultiLineText::_objectList);
 
   this->lineSpacing = 1.0;

branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.h

@@ -14 +14 @@
 class MultiLineText : public Text
 {
+  NewObjectListDeclaration(MultiLineText);
   public:
     MultiLineText(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE, float lineWidth = 100.0);

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

@@ -22 +22 @@
 #include "debug.h"
 
+NewObjectListDefinition(Text);
+
 /**
  * @brief creates a new Text Element
@@ -30 +32 @@
     // : _font(fontFile, FONT_DEFAULT_RENDER_SIZE)
 {
-  this->setClassID(CL_TEXT, "Text");
+  this->registerObject(this, Text::_objectList);
 
   // initialize this Text
@@ -44 +46 @@
     : _font()
 {
-  this->setClassID(CL_TEXT, "Text");
+  this->registerObject(this, Text::_objectList);
 
   *this = text;

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

@@ -26 +26 @@
 class Text : public Element2D
 {
+  NewObjectListDeclaration(Text);
   public:
     Text(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE);

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

@@ -34 +34 @@
 #include "graphics_engine.h"
 #include "util/loading/resource_manager.h"
-#include "class_list.h"
 
 #include "debug.h"
@@ -40 +39 @@
 /// TEXT-ENGINE ///
 ///////////////////
+NewObjectListDefinition(TextEngine);
 /**
  *  standard constructor
@@ -45 +45 @@
 TextEngine::TextEngine ()
 {
-   this->setClassID(CL_TEXT_ENGINE, "TextEngine");
-   this->setName("TextEngine");
-   this->enableFonts();
+  this->registerObject(this, TextEngine::_objectList);
+  this->setName("TextEngine");
+  this->enableFonts();
 }
 
@@ -62 +62 @@
 {
   // 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 +88 @@
 {
   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 +104 @@
 {
   if (TTF_WasInit())
-    {
-//      Font::removeDefaultFont();
-      TTF_Quit();
-    }
+  {
+    //      Font::removeDefaultFont();
+    TTF_Quit();
+  }
   else
     PRINTF(4)("Fonts were not initialized.\n");
@@ -122 +119 @@
 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 (NewObjectList<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 +148 @@
       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;
+  }
 }

branches/new_class_id/src/lib/graphics/text_engine/text_engine.h

@@ -24 +24 @@
 class TextEngine : public BaseObject
 {
- public:
+  NewObjectListDeclaration(TextEngine);
+  public:
   virtual ~TextEngine();
   /** @returns a Pointer to the only object of this Class */