Changeset 5252 in orxonox.OLD

Timestamp:

Sep 25, 2005, 1:16:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: reverted changes to the Element2D-class, they are not needed

Location:

trunk/src/lib/graphics/render2D

Files:

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

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

@@ -36 +36 @@
 /**
  * standard constructor
- * @param parent the Parent of this node (default NULL)
- */
+ * @todo this constructor is not jet implemented - do it
+*/
 Element2D::Element2D (Element2D* parent)
 {
@@ -48 +48 @@
 /**
  * standard deconstructor
- */
+*/
 Element2D::~Element2D ()
 {
@@ -54 +54 @@
   Render2D::getInstance()->unregisterElement2D(this);
 
-  this->remove2D();
-//   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 */
-//   }
+  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 */
+  }
   delete this->children;
 
@@ -89 +90 @@
   this->bindNode = NULL;
 
-  // PNODE-stuff
+  this->setParentMode2D(E2D_PARENT_ALL);
+  this->parent = NULL;
   this->children = new tList<Element2D>;
-  this->setParentMode2D(E2D_PARENT_ALL);
-  if (NullElement2D::isInstanciated())
-  {
-    this->parent = NullElement2D::getInstance();
-    NullElement2D::getInstance()->children->add(this);
-    NullElement2D::getInstance()->debug(0);
-  }
-  else
-    this->parent = NULL;
   this->absDirection = 0.0;
   this->relDirection = 0.0;
@@ -449 +442 @@
   if( likely(child->parent != NULL))
   {
+    PRINTF(4)("Element2D::addChild() - reparenting node: removing it and adding it again\n");
     child->parent->children->remove(child);
   }
@@ -511 +505 @@
 void Element2D::setParent2D (Element2D* parent)
 {
-  if (parent != NULL)
-    parent->addChild2D(this);
+  parent->addChild2D(this);
 }
 
@@ -524 +517 @@
   if (parentNode != NULL)
     parentNode->addChild2D(this);
+
 }
 

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 (!NullElement2D::singletonRef) NullElement2D::singletonRef = new NullElement2D();  return NullElement2D::singletonRef; };
-    inline static bool isInstanciated() { return (likely(NullElement2D::singletonRef != NULL))?true:false; };
+    inline static NullElement2D* getInstance() { if (!singletonRef) singletonRef = new NullElement2D();  return singletonRef; };
     virtual ~NullElement2D ();