Changeset 5027 in orxonox.OLD for orxonox/trunk

Timestamp:

Aug 15, 2005, 8:44:44 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: object-object collision detection enabled. there is no feedback jet

Location:

orxonox/trunk/src/lib/collision_detection

Files:

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

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

@@ -76 +76 @@
 void CDEngine::checkCollisionObjects()
 {
+  BVTree* tree;
   tIterator<WorldEntity>* iterator1 = entityList->getIterator();
   tIterator<WorldEntity>* iterator2 = entityList->getIterator();
@@ -86 +87 @@
     {
       PRINTF(3)("checking object %s against %s\n", entity1->getName(), entity2->getName());
-      //entity1->getOBBTree()->collideWith(entity1, entity2);
+      tree = entity1->getOBBTree();
+      if( likely(tree != NULL)) tree->collideWith(entity1, entity2);
       entity2 = iterator2->nextElement();
     }

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

@@ -112 +112 @@
 void OBBTree::collideWith(WorldEntity* entity1, WorldEntity* entity2)
 {
-  this->rootNode->collideWith(((OBBTree*)entity2->getOBBTree())->getRootNode(), (PNode*)entity1, (PNode*)entity2);
+  if( likely(entity2->getOBBTree() != NULL) )
+    this->rootNode->collideWith(((OBBTree*)entity2->getOBBTree())->getRootNode(), (PNode*)entity1, (PNode*)entity2);
 }