Changeset 5718 in orxonox.OLD for branches/collision_detection/src/lib/collision_detection/obb_tree.cc

Timestamp:

Nov 23, 2005, 1:06:44 AM (18 years ago)

Author:

patrick

Message:

collision_detection: and again a heavy cleanup in the function arguments

File:

• branches/collision_detection/src/lib/collision_detection/obb_tree.cc (modified) (1 diff)

branches/collision_detection/src/lib/collision_detection/obb_tree.cc

@@ -104 +104 @@
 
 
-void OBBTree::collideWith(WorldEntity* entity1, WorldEntity* entity2)
-{
-  if( likely(entity2->getOBBTree() != NULL) )
-    this->rootNode->collideWith(((OBBTree*)entity2->getOBBTree())->getRootNode(), entity1, entity2);
-}
-
-
 /**
  * this collides two bvtrees together. the trees are attached to pnodes Objects A and B
- * @param tree: the other tree to collide with (Object B)
  * @param nodeA: PNode of object A
  * @param nodeB: Pnode of object B
  */
-void OBBTree::collideWith(BVTree* tree, WorldEntity* nodeA, WorldEntity* nodeB)
+void OBBTree::collideWith(const WorldEntity& entity1, const WorldEntity& entity2) const
 {
-  this->rootNode->collideWith(((OBBTree*)tree)->getRootNode(), nodeA, nodeB);
+  if( likely(entity2.getOBBTree() != NULL) )
+    this->rootNode->collideWith(*(((OBBTree*)entity2.getOBBTree())->getRootNode()), entity1, entity2);
 }
+