Changeset 4694 in orxonox.OLD for orxonox/trunk/src/lib/collision_detection/cd_engine.cc

Timestamp:

Jun 24, 2005, 6:10:13 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now ready to implement the collision detection algorithm

File:

• orxonox/trunk/src/lib/collision_detection/cd_engine.cc (modified) (1 diff)

orxonox/trunk/src/lib/collision_detection/cd_engine.cc

@@ -59 +59 @@
   tIterator<WorldEntity>* iterator2 = entityList->getIterator();
   WorldEntity* entity1 = iterator1->nextElement();
-  WorldEntity* entity2 = iterator2->nextElement();
+  WorldEntity* entity2 = iterator2->seekElement(entity1);
+  printf("checking for collisions\n");
   while( entity1 != NULL)
   {
-    while( entity2 != NULL && entity1 != entity2)
+    printf("entering l1\n");
+    while( entity2 != NULL)
     {
+      printf("entering l2 - checking object %s against %s\n", entity1->getName(), entity2->getName());
       entity1->collideWith(entity2);
       entity2 = iterator2->nextElement();
+
     }
     entity1 = iterator1->nextElement();
+    entity2 = iterator2->seekElement(entity1);
+
   }
   delete iterator1;
   delete iterator2;
-
-
 }