Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/track_manager.cc

Timestamp:

Apr 7, 2005, 3:54:49 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

File:

• orxonox/branches/levelloader/src/track_manager.cc (modified) (9 diffs)

orxonox/branches/levelloader/src/track_manager.cc

@@ -18 +18 @@
 #include "track_manager.h"
 
+#include "base_object.h"
 #include "p_node.h"
 #include "substring.h"
 
 #include "track_node.h"
+#include "stdincl.h"
+#include "list.h"
+#include "debug.h"
+
+
 
 #include <stdarg.h>
@@ -67 +73 @@
   if ((!this->isJoined &&this->childCount > 0) || (this->isJoined && this->mainJoin))
     {
-      TrackElement* enumElem = children->enumerate();
+      tIterator<TrackElement>* iterator = this->children->getIterator();
+      TrackElement* enumElem = iterator->nextElement();
       while (enumElem)
         {
           delete enumElem;
-          enumElem = children->nextElement();
-        }
+          enumElem = iterator->nextElement();
+        }
+      delete iterator;
       delete this->children;
     }
@@ -92 +100 @@
   if (this->childCount > 0)
     {
-      TrackElement* enumElem = this->children->enumerate();
+      tIterator<TrackElement>* iterator = this->children->getIterator();
+      TrackElement* enumElem = iterator->nextElement();
       TrackElement* tmpElem;
       while (enumElem)
@@ -98 +107 @@
           if ((tmpElem = enumElem->findByID(trackID)))
             return tmpElem;
-          enumElem = this->children->nextElement();
-        }
+          enumElem = iterator->nextElement();
+        }
+      delete iterator;
     }
   else 
@@ -145 +155 @@
   else
     {
-      TrackElement* enumElem = this->children->enumerate();
+      tIterator<TrackElement>* iterator = this->children->getIterator();
+      TrackElement* enumElem = iterator->nextElement();
       while (enumElem)
         {
           if(!enumElem->backLoopCheck(trackElem))
             return false;
-          enumElem = this->children->nextElement();
-        }
+          enumElem = iterator->nextElement();
+        }
+      delete iterator;
       
       return true;
@@ -287 +299 @@
   PNode* tmpNode = (PNode*)node;
 
-  if (tmpNode->getRelCoor().z < 0)
+  if (tmpNode->getRelCoor()->z < 0)
     return 0;
   else 
@@ -308 +320 @@
   PNode* tmpNode = (PNode*)node;
 
-  Vector nodeRelCoord = tmpNode->getRelCoor();
+  Vector nodeRelCoord = *tmpNode->getRelCoor();
   float minDist = 100000000;
   int childNumber = 0;
@@ -910 +922 @@
 void TrackManager::drawGraph(float dt) const
 {
-
   for (int i = 1; i <= trackElemCount; i++)
     {
@@ -922 +933 @@
             glVertex3f(tmpVector.x, tmpVector.y, tmpVector.z);
           }
-  glEnd();
+      glEnd();
     }
 }