Changeset 5110 in orxonox.OLD for trunk/src/lib/physics

Timestamp:

Aug 23, 2005, 11:07:40 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: changed the behaviour of the iterator.
Now it is soon possible to walk through a List from front and back, and tell the Iterator from where to seek

@patrick: i had to disable your Collision-Detection algorithms, because they had a seekElement inside, that i did not entirely grasp the meaning of….
trying to fix this now

Location:

trunk/src/lib/physics

Files:

• physics_engine.cc (modified) (6 diffs)
• physics_interface.cc (modified) (1 diff)

trunk/src/lib/physics/physics_engine.cc

@@ -52 +52 @@
 {
   // delete all PhysicsConnections that are still in existence
-  tIterator<PhysicsConnection>* itPC = this->connections->getIterator();
-  PhysicsConnection* enumPC = itPC->nextElement();
-  while (enumPC)
-  {
-    delete enumPC;
-    enumPC = itPC->nextElement();
-  }
-  delete itPC;
-  delete this->connections;
-
-  // delete all PhysicsInterfaces, still in existence (this could be dangerous)
-  tIterator<PhysicsInterface>* itPI = this->interfaces->getIterator();
-  PhysicsInterface* enumPI = itPI->nextElement();
-  while (enumPI)
-  {
-    delete enumPI;
-
-    enumPI = itPI->nextElement();
-  }
-  delete itPI;
-  delete this->interfaces;
-
-  // delete all PhysicsFields, still in existence (this could be dangerous)
-  tIterator<Field>* itF = this->fields->getIterator();
-  Field* enumF = itF->nextElement();
-  while (enumF)
-  {
-    delete enumF;
-
-    enumF = itF->nextElement();
-  }
-  delete itF;
-  delete this->fields;
+//   tIterator<PhysicsConnection>* itPC = this->connections->getIterator();
+//   PhysicsConnection* enumPC = itPC->firstElement();
+//   while (enumPC)
+//   {
+//     delete enumPC;
+//     enumPC = itPC->nextElement();
+//   }
+//   delete itPC;
+//   delete this->connections;
+//
+//   // delete all PhysicsInterfaces, still in existence (this could be dangerous)
+//   tIterator<PhysicsInterface>* itPI = this->interfaces->getIterator();
+//   PhysicsInterface* enumPI = itPI->firstElement();
+//   while (enumPI)
+//   {
+//     delete enumPI;
+//
+//     enumPI = itPI->nextElement();
+//   }
+//   delete itPI;
+//   delete this->interfaces;
+//
+//   // delete all PhysicsFields, still in existence (this could be dangerous)
+//   tIterator<Field>* itF = this->fields->getIterator();
+//   Field* enumF = itF->firstElement();
+//   while (enumF)
+//   {
+//     delete enumF;
+//
+//     enumF = itF->nextElement();
+//   }
+//   delete itF;
+//   delete this->fields;
 
 
@@ -163 +163 @@
 {
   tIterator<PhysicsInterface>* tmpIt = interfaces->getIterator();
-  PhysicsInterface* tmpInt = tmpIt->nextElement();
+  PhysicsInterface* tmpInt = tmpIt->firstElement();
   while(tmpInt)
   {
@@ -206 +206 @@
 {
   tIterator<Field>* tmpIt = fields->getIterator();
-  Field* tmpField = tmpIt->nextElement();
+  Field* tmpField = tmpIt->firstElement();
   while(tmpField)
   {
@@ -251 +251 @@
 {
   tIterator<PhysicsConnection>* tmpIt = connections->getIterator();
-  PhysicsConnection* tmpConn = tmpIt->nextElement();
+  PhysicsConnection* tmpConn = tmpIt->firstElement();
   while(tmpConn)
   {
@@ -278 +278 @@
   meaning let the fields work */
   tIterator<PhysicsConnection>* itPC = this->connections->getIterator();
-  PhysicsConnection* enumPC = itPC->nextElement();
+  PhysicsConnection* enumPC = itPC->firstElement();
   while (enumPC)
     {
@@ -289 +289 @@
   /* actually tick all the PhysicsInterfaces. Move the objects around */
   tIterator<PhysicsInterface>* itPI = this->interfaces->getIterator();
-  PhysicsInterface* enumPI = itPI->nextElement();
+  PhysicsInterface* enumPI = itPI->firstElement();
   while (enumPI)
     {

trunk/src/lib/physics/physics_interface.cc

@@ -68 +68 @@
 
     tIterator<PNode>* iterator = massCalcPNode->children->getIterator();
-    PNode* pn = iterator->nextElement();
+    PNode* pn = iterator->firstElement();
     while( pn != NULL)
     {