Changeset 5038 in orxonox.OLD for orxonox

Timestamp:

Aug 16, 2005, 6:46:10 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now collision detection enabled again. excluded the cd with the terrain, which took about 33fps now the performance is acceptable again

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

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

@@ -66 +66 @@
 void CDEngine::checkCollisions()
 {
-  //this->checkCollisionObjects();
+  this->checkCollisionObjects();
   this->checkCollisionGround();
 }
@@ -84 +84 @@
   while( entity1 != NULL)
   {
-    while( entity2 != NULL)
+    if( likely(entity1 != this->terrain))
     {
-      PRINTF(3)("checking object %s against %s\n", entity1->getName(), entity2->getName());
-      tree = entity1->getOBBTree();
-      if( likely(tree != NULL)) tree->collideWith(entity1, entity2);
-      entity2 = iterator2->nextElement();
+      while( entity2 != NULL)
+      {
+        if( likely(entity2 != this->terrain))
+        {
+          PRINTF(3)("checking object %s against %s\n", entity1->getName(), entity2->getName());
+          tree = entity1->getOBBTree();
+          if( likely(tree != NULL)) tree->collideWith(entity1, entity2);
+        }
+        entity2 = iterator2->nextElement();
+      }
     }
     entity1 = iterator1->nextElement();

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

@@ -628 +628 @@
   if( this->overlapTest(this->bvElement, ((OBBTreeNode*)treeNode)->bvElement, nodeA, nodeB))
   {
+    //PRINTF(0)("collision @ lvl %i, object %s vs %s\n", this->depth, nodeA->getClassName(), nodeB->getClassName());
+
     /* check if left node overlaps */
     if( likely( this->nodeLeft != NULL))

orxonox/trunk/src/story_entities/world.cc

@@ -926 +926 @@
   {
     if( entity->isVisible() ) entity->draw();
-    //entity->drawBVTree(2, 226);
+    entity->drawBVTree(2, 226);
     entity = iterator->nextElement();
   }