Changeset 5717 in orxonox.OLD for branches/collision_detection/src/lib/collision_detection/cd_engine.cc

Timestamp:

Nov 23, 2005, 12:31:47 AM (18 years ago)

Author:

patrick

Message:

collision_detection: work flush

File:

• branches/collision_detection/src/lib/collision_detection/cd_engine.cc (modified) (3 diffs)

branches/collision_detection/src/lib/collision_detection/cd_engine.cc

@@ -14 +14 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION_DETECTION
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_COLLISION
 
 #include "cd_engine.h"
@@ -78 +78 @@
 void CDEngine::checkCollisionObjects()
 {
-  BVTree* tree;
+  const BVTree* tree;
   tIterator<WorldEntity>* iterator1 = entityList->getIterator();
   tIterator<WorldEntity>* iterator2 = entityList->getIterator();
@@ -94 +94 @@
         if( likely(entity2 != this->terrain))
         {
-          PRINTF(4)("checking object %s against %s\n", entity1->getName(), entity2->getName());
+          printf("checking object %s against %s\n", entity1->getName(), entity2->getName());
           tree = entity1->getOBBTree();
-          if( likely(tree != NULL) && entity2->getOBBTree() != NULL) tree->collideWith(entity1, entity2);
+
+          if( likely(tree != NULL) && entity2->getOBBTree() != NULL)
+            //tree->collideWith(entity1, entity2);
+            PRINTF(5)("Collision check\n");
         }
         entity2 = iterator2->nextElement();