Changeset 5077 in orxonox.OLD

Timestamp:

Aug 19, 2005, 4:12:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now no runtime-errors anymore.
Also fixed the TextEngine, so no it does not need the TextList anymore, but ClassList

Location:

trunk/src

Files:

• lib/graphics/text_engine.cc (modified) (7 diffs)
• lib/graphics/text_engine.h (modified) (2 diffs)
• util/shell.cc (modified) (1 diff)

trunk/src/lib/graphics/text_engine.cc

@@ -32 +32 @@
 #include "graphics_engine.h"
 #include "resource_manager.h"
+#include "class_list.h"
 
 #include "p_node.h"
@@ -74 +75 @@
   ResourceManager::getInstance()->unload(this->font);
 
-//  if (this->text)
-    //delete []this->text;
-  TextEngine::getInstance()->deleteText(this);
+  if (this->text)
+    delete []this->text;
 }
 
@@ -764 +764 @@
    this->setName("TextEngine");
    this->enableFonts();
-
-   this->textList = new tList<Text>;
 }
 
@@ -780 +778 @@
 {
   this->disableFonts();
-
-  delete this->textList;
 
   TextEngine::singletonRef = NULL;
@@ -834 +830 @@
     }
 
-  newText = new Text(tmpFont, TEXT_DYNAMIC);
-  textList->add(newText);
-
-  return newText;
-}
-
-/**
- *  removes a Text from the List
- * @param text: the text to delete
-
-   this only ereases allocated memory, and removes the text
-   The normal way to call it, is through "delete text;"
-   So you do not have to concetn yourselves with this.
-*/
-void TextEngine::deleteText(Text* text)
-{
-  textList->remove(text);
+  return new Text(tmpFont, TEXT_DYNAMIC);
 }
 
@@ -858 +838 @@
 void TextEngine::flush()
 {
-  tIterator<Text>* textIterator = textList->getIterator();
-  Text* text = textIterator->nextElement();
+  tIterator<BaseObject>* textIterator = ClassList::getList(CL_TEXT)->getIterator();
+  Text* text = dynamic_cast<Text*>(textIterator->nextElement());
   while( text != NULL)
     {
       delete text;
-      text = textIterator->nextElement();
+      text = dynamic_cast<Text*>(textIterator->nextElement());
     }
   delete textIterator;
@@ -878 +858 @@
   PRINT(0)("+ TEXT ENGINE DEBUG INFORMATION +\n");
   PRINT(0)("+-------------------------------+\n");
-  PRINT(0)("Reference: %p; Text Counts: %d\n", this, this->textList->getSize());
-
-  tIterator<Text>* textIterator = textList->getIterator();
-  Text* text = textIterator->nextElement();
+  PRINT(0)("Reference: %p; Text Counts: %d\n", this, ClassList::getList(CL_TEXT)->getSize());
+
+  tIterator<BaseObject>* textIterator = ClassList::getList(CL_TEXT)->getIterator();
+  Text* text = dynamic_cast<Text*>(textIterator->nextElement());
   while( text != NULL)
     {
       text->debug();
-      text = textIterator->nextElement();
+      text = dynamic_cast<Text*>(textIterator->nextElement());
     }
   delete textIterator;

trunk/src/lib/graphics/text_engine.h

@@ -218 +218 @@
                    Uint8 b = FONT_DEFAULT_COLOR_B);
 
-  void deleteText(Text* text);
   void flush();
 
@@ -234 +233 @@
  private:
   //  tList<Font>* fontList;
-  tList<Text>*       textList;      //!< a list of all texts registered to the textEngine @todo this is overhead, do we need this??
 
 };

trunk/src/util/shell.cc

@@ -41 +41 @@
   //this->bufferDisplaySize = 0;
   this->setBufferSize(100);
-  this->setBufferDisplaySize(5);
+  // this->setBufferDisplaySize(1);