Changeset 3669 in orxonox.OLD for orxonox/trunk/src/lib/coord

Timestamp:

Mar 30, 2005, 12:06:36 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: now garbage collection is working correctlymake

Location:

orxonox/trunk/src/lib/coord

Files:

• null_parent.cc (modified) (2 diffs)
• p_node.cc (modified) (4 diffs)

orxonox/trunk/src/lib/coord/null_parent.cc

@@ -83 +83 @@
   *this->absCoordinate = *this->relCoordinate;
   *this->absDirection = parent->getAbsDir () * *this->relDirection;
-  
-  PNode* pn = this->children->enumerate ();
+
+  tIterator<PNode>* iterator = this->children->getIterator();
+  //PNode* pn = this->children->enumerate ();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL) 
     { 
@@ -93 +95 @@
         pn->parentDirChanged ();
       pn->update (dt);
-      pn = this->children->nextElement ();
+      //pn = this->children->nextElement ();
+      pn = iterator->nextElement();
     }
 

orxonox/trunk/src/lib/coord/p_node.cc

@@ -354 +354 @@
 {
   pNode->remove();
-  //this->children->remove (pNode);
+  this->children->remove (pNode);
   pNode->parent = NULL;
 }
@@ -378 +378 @@
     }
   delete iterator;
-  //this->parent->removeChild(this);
+  this->parent->children->remove(this);
 }
 
@@ -499 +499 @@
   
   
-  PNode* pn = this->children->enumerate();
+  tIterator<PNode>* iterator = this->children->getIterator();
+  //PNode* pn = this->children->enumerate();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL) 
     { 
@@ -509 +511 @@
 
       pn->update(dt);
-      pn = this->children->nextElement();
-    }
+      //pn = this->children->nextElement();
+      pn = iterator->nextElement();
+    }
+  delete iterator;
 
   this->timeStamp = timeStamp;