Changeset 5285 in orxonox.OLD for trunk/src/lib/graphics/render2D

Timestamp:

Oct 6, 2005, 8:31:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: nicer quit-modi
TextEngine is now deleted by GraphicsEngine
trying to fix errors in the Element2D deletion

Location:

trunk/src/lib/graphics/render2D

Files:

• element_2d.cc (modified) (8 diffs)
• element_2d.h (modified) (1 diff)

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

@@ -25 +25 @@
 #include "class_list.h"
 #include "list.h"
+#include "color.h"
 
 using namespace std;
 
+/**
+ * standard constructor
+ */
 Element2D::Element2D()
 {
   this->init();
+
   this->setParent2D(NullElement2D::getInstance());
+  NullElement2D::getInstance()->debug(0);
 }
 
 /**
  * standard constructor
- * @todo this constructor is not jet implemented - do it
-*/
+ * @param parent the parent to set for this Element2D
+ *
+ * NullElement2D needs this constructor with parameter NULL to initialize
+ * itself. Otherwise it would result in an endless Loop.
+ */
 Element2D::Element2D (Element2D* parent)
 {
@@ -44 +53 @@
   if (this->parent != NULL)
     this->setParent2D(parent);
+  else if (NullElement2D::isInstanciated())
+    this->setParent2D(NullElement2D::getInstance());
 }
 
 /**
  * standard deconstructor
-*/
+ *
+ * There are two general ways to delete an Element2D
+ * 1. delete instance;
+ *   -> result
+ *    delete this Node and all its children and children's children...
+ *    (danger if you still want the instance!!)
+ *
+ * 2. instance->remove2D(); delete instance;
+ *   -> result:
+ *    moves its children to the NullParent
+ *    then deletes the Element.
+ */
 Element2D::~Element2D ()
 {
@@ -54 +76 @@
   Render2D::getInstance()->unregisterElement2D(this);
 
-  if (this->parent)
-    this->parent->removeChild2D(this);
-  else
-  {
-    tIterator<Element2D>* iterator = this->children->getIterator();
-    Element2D* pn = iterator->firstElement();
-    while( pn != NULL)
-    {
-      delete pn;
-      pn = iterator->nextElement();
-    }
-    delete iterator;
-    /* this deletes all children in the list */
+  // remove the Node, delete it's children.
+  tIterator<Element2D>* iterator = this->children->getIterator();
+  Element2D* child = iterator->firstElement();
+
+  while( child != NULL)
+  {
+    delete child;
+    child = iterator->nextElement();
+  }
+  delete iterator;
+
+  if (this->parent != NULL)
+  {
+    this->parent->children->remove(this);
+    this->parent = NULL;
   }
   delete this->children;
 
+  // remove all other allocated memory.
   if (this->toCoordinate != NULL)
     delete this->toCoordinate;
@@ -99 +124 @@
   this->toCoordinate = NULL;
   this->toDirection = NULL;
-//  else
-  //  this->setParent2D(parent);
 
   Render2D::getInstance()->registerElement2D(this);
@@ -480 +503 @@
 
 /**
- * remove this pnode from the tree and adds all following to NullParent
+ * remove this Element from the tree and adds all children to NullElement2D
  *
- * this can be the case, if an entity in the world is being destroyed.
+ * afterwards this Node is free, and can be reattached, or deleted freely.
  */
 void Element2D::remove2D()
@@ -495 +518 @@
   }
   delete iterator;
+
+  delete this->children;
+  this->children = new tList<Element2D>;
+
   if (this->parent != NULL)
+  {
     this->parent->children->remove(this);
+    this->parent = NULL;
+  }
 }
 
@@ -762 +792 @@
 }
 
-#include "color.h"
+/**
+ * ticks the 2d-Element
+ * @param dt the time elapsed since the last tick
+ */
+void Element2D::tick(float dt)
+{
+
+}
 
 /**
@@ -816 +853 @@
 
 
-
-/**
- * ticks the 2d-Element
- * @param dt the time elapsed since the last tick
- */
-void Element2D::tick(float dt)
-{
-
-}
-
-
-
-
-
-
-
+///////////////////
+// NullElement2D //
+///////////////////
 NullElement2D* NullElement2D::singletonRef = 0;
 

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

@@ -218 +218 @@
   public:
     /** @returns a Pointer to the only object of this Class */
-    inline static NullElement2D* getInstance() { if (!singletonRef) singletonRef = new NullElement2D();  return singletonRef; };
+    inline static NullElement2D* getInstance() { if (!NullElement2D::singletonRef) NullElement2D::singletonRef = new NullElement2D();  return NullElement2D::singletonRef; };
+    inline static bool isInstanciated() { return (NullElement2D::singletonRef != NULL)?true:false; };
     virtual ~NullElement2D ();