Changeset 5078 in orxonox.OLD for trunk/src/lib

Timestamp:

Aug 19, 2005, 5:02:38 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shell is running, but only in orxonox-world, not all-over
I do not know why this behaviour occurs, but maybe it is because of some errors in other pointers…
who knows

Location:

trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (1 diff)
• render2D/render_2d.cc (modified) (1 diff)
• text_engine.cc (modified) (2 diffs)
• text_engine.h (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -451 +451 @@
       this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextMaxFPS->setPosition2D(5, 35);
-      this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
+      this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
       this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextMinFPS->setPosition2D(5, 65);

trunk/src/lib/graphics/render2D/render_2d.cc

@@ -88 +88 @@
 void Render2D::moveToLayer(Element2D* element2D, E2D_LAYER to)
 {
-  this->element2DList[(int)log2(element2D->getLayer())]->remove(element2D);
-  this->element2DList[(int)log2(to)]->add(element2D);
+  if (element2D->getLayer() != to)
+  {
+    this->element2DList[(int)log2(element2D->getLayer())]->remove(element2D);
+    this->element2DList[(int)log2(to)]->add(element2D);
+  }
 }
 

trunk/src/lib/graphics/text_engine.cc

@@ -813 +813 @@
 /**
  *  creates a new Text with a certain font.
-   \see Font::Font
-   \see Text::Text
+   @see Font::Font
+   @see Text::Text
 */
 Text* TextEngine::createText(const char* fontFile, unsigned int fontSize, int textType, Uint8 r, Uint8 g, Uint8 b)
@@ -831 +831 @@
 
   return new Text(tmpFont, TEXT_DYNAMIC);
-}
-
-/**
- *  deletes all the Text, and tries to delete all allocated fonts
-*/
-void TextEngine::flush()
-{
-  tIterator<BaseObject>* textIterator = ClassList::getList(CL_TEXT)->getIterator();
-  Text* text = dynamic_cast<Text*>(textIterator->nextElement());
-  while( text != NULL)
-    {
-      delete text;
-      text = dynamic_cast<Text*>(textIterator->nextElement());
-    }
-  delete textIterator;
 }
 

trunk/src/lib/graphics/text_engine.h

@@ -218 +218 @@
                    Uint8 b = FONT_DEFAULT_COLOR_B);
 
-  void flush();
-
   void debug() const;