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

Timestamp:

Aug 24, 2005, 1:30:13 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: reimplemented the list functions, as i did before in revision 5110.
This time, i looked out for the bugs, and i think i found one

@patrick: i know, that you do not want to code at the moment… :/ → see mail

Location:

trunk/src/lib/collision_detection

Files:

• cd_engine.cc (modified) (4 diffs)
• obb_tree.cc (modified) (1 diff)
• obb_tree_node.cc (modified) (2 diffs)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -71 +71 @@
 }
 
-
+#include "class_list.h"
+#include "state.h"
 /**
  *  this checks the collisions with the objects
@@ -80 +81 @@
   tIterator<WorldEntity>* iterator1 = entityList->getIterator();
   tIterator<WorldEntity>* iterator2 = entityList->getIterator();
-  WorldEntity* entity1 = iterator1->nextElement();
-  WorldEntity* entity2 = iterator2->seekElement(entity1);
+  WorldEntity* entity1 = iterator1->firstElement();
+  WorldEntity* entity2 = iterator2->iteratorElement(iterator1);
+  //entity2 = iterator2->nextElement();
   PRINTF(3)("checking for collisions\n");
   while( entity1 != NULL)
@@ -87 +89 @@
     if( likely(entity1 != this->terrain))
     {
+      entity2 = iterator2->nextElement();
+
       while( entity2 != NULL)
       {
-        if( likely(entity2 != this->terrain))
+//        if (entity2 != NULL)
+//          printf("entity2::%s::%s", entity2->getClassName(), getName());
+
+        ///////////////// FIXME
+        ///////////////// COMMENTED OUT, because some part of it generated a segfault
+        ////////////////
+
+/*                if( likely(entity2 != this->terrain))
         {
-          PRINTF(3)("checking object %s against %s\n", entity1->getName(), entity2->getName());
+          PRINTF(4)("checking object %s against %s\n", entity1->getName(), entity2->getName());
           tree = entity1->getOBBTree();
-          if( likely(tree != NULL)) tree->collideWith(entity1, entity2);
-        }
+          if( likely(tree != NULL) && entity2->getOBBTree() != NULL) tree->collideWith(entity1, entity2);
+        }*/
         entity2 = iterator2->nextElement();
       }
+//      printf("\n");
     }
     entity1 = iterator1->nextElement();
-    entity2 = iterator2->seekElement(entity1);
-
+    entity2 = iterator2->iteratorElement(iterator1);
   }
   delete iterator1;
@@ -133 +144 @@
 
   tIterator<WorldEntity>* iterator = entityList->getIterator();
-  WorldEntity* entity = iterator->nextElement();
+  WorldEntity* entity = iterator->firstElement();
   while( entity != NULL)
   {

trunk/src/lib/collision_detection/obb_tree.cc

@@ -47 +47 @@
 {
   this->setClassID(CL_OBB_TREE, "OBBTree");
+
+  this->rootNode = NULL;
 
   material = new Material*[5];

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)