Changeset 3832 in orxonox.OLD for orxonox/trunk/src/track_manager.cc

Timestamp:

Apr 14, 2005, 1:16:31 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: animation class functions implemented, list enhanced

File:

• orxonox/trunk/src/track_manager.cc (modified) (8 diffs)

orxonox/trunk/src/track_manager.cc

@@ -149 +149 @@
     childCount = this->childCount;
   
-  TrackElement* enumElem = this->children->enumerate();
+  //  TrackElement* enumElem = this->children->enumerate();
+  tIterator<TrackElement>* iterator = this->children->getIterator();
+  TrackElement* enumElem = iterator->nextElement();
   for (int i = 0; i < childCount; i++)
-    enumElem = this->children->nextElement();
+    enumElem = iterator->nextElement();
+  delete iterator;
   return enumElem;
 }
@@ -200 +203 @@
     {
       PRINT(0)("   has %d children: ", this->childCount);
-      TrackElement* enumElem = this->children->enumerate();
+      //TrackElement* enumElem = this->children->enumerate();
+      tIterator<TrackElement>* iterator = this->children->getIterator();
+      TrackElement* enumElem = iterator->nextElement();
       while (enumElem)
         {
           PRINT(0)("=%d= ", enumElem->ID);
-          enumElem = this->children->nextElement();
+          enumElem = iterator->nextElement();
         }
+      delete iterator;
       PRINT(0)("\n");
     }
@@ -294 +300 @@
   int i = 0;
 
-  TrackElement* enumElem = this->children->enumerate();
+  //TrackElement* enumElem = this->children->enumerate();
+  tIterator<TrackElement>* iterator = this->children->getIterator();
+  TrackElement* enumElem = iterator->nextElement();
   while (enumElem)
     {
@@ -304 +312 @@
         }
       i++;
-      enumElem = this->children->nextElement();
-    }
+      enumElem = iterator->nextElement();
+    }
+  delete iterator;
 
   PRINTF(4)("PathDecision with nearest algorithm: %d\n", childNumber);
@@ -692 +701 @@
   if(firstJoint->childCount > 0)
     {
-      TrackElement* enumElem = firstJoint->children->enumerate();
+      //TrackElement* enumElem = firstJoint->children->enumerate();
+      tIterator<TrackElement>* iterator = firstJoint->children->getIterator();
+      TrackElement* enumElem = iterator->nextElement();
       while (enumElem)
         {
@@ -699 +710 @@
           enumElem->endTime = tmpLatestTime + enumElem->duration;
           
-          enumElem = firstJoint->children->nextElement();
+          enumElem = iterator->nextElement();
         }
+      delete iterator;
     }
   // returning to the TrackElement we were working on.
@@ -716 +728 @@
     {
       TrackElement* tmpElem = findTrackElementByID(i);
-      if (tmpElem->childCount > 0 && tmpElem->mainJoin)
+      if( tmpElem->childCount > 0 && tmpElem->mainJoin)
         {
-
-          TrackElement* enumElem = tmpElem->children->enumerate();
+          tIterator<TrackElement>* iterator = tmpElem->children->getIterator();
+          TrackElement* enumElem = iterator->nextElement();
+          //TrackElement* enumElem = tmpElem->children->enumerate();
           while (enumElem)
             {
@@ -740 +753 @@
                      enumElem->curve->calcAcc(0).x, enumElem->curve->calcAcc(0).y, enumElem->curve->calcAcc(0).z);
               
-              enumElem = tmpElem->children->nextElement();
+              enumElem = iterator->nextElement();
             }
+          delete iterator;
         }
     }