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

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/collision_detection

Files:

• cd_engine.cc (modified) (3 diffs)
• obb_tree_node.cc (modified) (2 diffs)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -80 +80 @@
   tIterator<WorldEntity>* iterator1 = entityList->getIterator();
   tIterator<WorldEntity>* iterator2 = entityList->getIterator();
-  WorldEntity* entity1 = iterator1->nextElement();
+  WorldEntity* entity1 = iterator1->firstElement();
   WorldEntity* entity2 = iterator2->seekElement(entity1);
   PRINTF(3)("checking for collisions\n");
-  while( entity1 != NULL)
+/*  while( entity1 != NULL)
   {
     if( likely(entity1 != this->terrain))
@@ -101 +101 @@
     entity2 = iterator2->seekElement(entity1);
 
-  }
+  }*/
   delete iterator1;
   delete iterator2;
@@ -133 +133 @@
 
   tIterator<WorldEntity>* iterator = entityList->getIterator();
-  WorldEntity* entity = iterator->nextElement();
+  WorldEntity* entity = iterator->firstElement();
   while( entity != NULL)
   {

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -574 +574 @@
 
   iterator = partition1.getIterator();
-  element = iterator->nextElement();
+  element = iterator->firstElement();
   index = 0;
   while( element != NULL)
@@ -592 +592 @@
 
   iterator = partition2.getIterator();
-  element = iterator->nextElement();
+  element = iterator->firstElement();
   index = 0;
   while( element != NULL)