Changeset 5286 in orxonox.OLD for trunk/src

Timestamp:

Oct 6, 2005, 9:25:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed a bug in the deletion Process of NullElement2D. deleted list before entities that were stored in the lists… stupid me…

Location:

trunk/src/lib/graphics

Files:

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

trunk/src/lib/graphics/graphics_engine.cc

@@ -84 +84 @@
 
   delete Render2D::getInstance();
+  //TextEngine
   delete TextEngine::getInstance();
 

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

@@ -35 +35 @@
 {
   this->init();
-
   this->setParent2D(NullElement2D::getInstance());
-  NullElement2D::getInstance()->debug(0);
 }
 
@@ -51 +49 @@
   this->init();
 
+  // check Parenting, and if ok parent the stuff
   if (this->parent != NULL)
     this->setParent2D(parent);

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

@@ -51 +51 @@
 Render2D::~Render2D ()
 {
+  delete NullElement2D::getInstance();
+
   for (int i = 0; i < E2D_LAYER_COUNT; i++)
     delete this->element2DList[i];
 
-  delete NullElement2D::getInstance();
   Render2D::singletonRef = NULL;
 }