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

Timestamp:

Jan 31, 2006, 7:12:41 PM (19 years ago)

Author:

patrick

Message:

cd: compiles again

File:

• branches/current_cd/src/lib/collision_detection/obb_tree.cc (modified) (2 diffs)

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

@@ -31 +31 @@
  *  standard constructor
 */
-OBBTree::OBBTree(int depth, const modelInfo& modelInf)
+OBBTree::OBBTree(int depth, const modelInfo* modelInf)
   : BVTree()
 {
   this->depth = depth;
   this->init();
-  this->spawnBVTree(modelInf);
+  this->spawnBVTree(*modelInf);
 }
 
@@ -92 +92 @@
  * @param nodeB: Pnode of object B
  */
-void OBBTree::collideWith(const WorldEntity& entity1, const WorldEntity& entity2) const
+void OBBTree::collideWith(WorldEntity* entity1, WorldEntity* entity2)
 {
-  if( likely(entity2.getOBBTree() != NULL) )
-    this->rootNode->collideWith(*(((OBBTree*)entity2.getOBBTree())->getRootNode()), entity1, entity2);
+  if( likely(entity2->getOBBTree() != NULL) )
+    this->rootNode->collideWith(*(((OBBTree*)entity2->getOBBTree())->getRootNode()), entity1, entity2);
 }