Changeset 10033 in orxonox.OLD for trunk/src/lib/collision_detection

Timestamp:

Dec 7, 2006, 3:05:27 PM (18 years ago)

Author:

patrick

Message:

moved some of the importer sources, probably will need to rebuild the project

Location:

trunk/src/lib/collision_detection

Files:

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

trunk/src/lib/collision_detection/cd_engine.cc

@@ -29 +29 @@
 //#include "quadtree_node.h"
 
-#include "bsp_manager.h"
+#include "bsp/bsp_manager.h"
 #include "bsp_entity.h"
 

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -20 +20 @@
 
 #include "collision_tube.h"
+#include "world_entity.h"
 
 #include "matrix.h"
@@ -479 +480 @@
     return;
 
-#warning this should be done
-//   if( !CoRe::CollisionTube::getInstance()->isReactive( *nodeA, *nodeB) )
+  PRINTF(4)("collideWith\n");
+  PRINTF(5)("Checking OBB %i vs %i: ", this->getIndex(), treeNode->getIndex());
+
+  // check if these world entities have registered for a collision reaction between each other
+//   if( !nodeA->isReactive( *nodeB) && !nodeB->isReactive( *nodeA) )
 //     return;
 
+  // now use bounding spheres as a first collision estimation
 //   float distanceMax = this->bvElement->radius + ((OBBTreeNode*)treeNode)->bvElement->radius;
 //   float distance = fabs((nodeA->getAbsCoor() - nodeB->getAbsCoor()).len());
-
-
-//   if( distance < distanceMax)
-//     PRINTF(0)(" %s (%s: group %i) vs %s (%s: group %i): distanceMax: %f, distance: %f\n", nodeA->getClassCName(), nodeA->getName(), nodeA->getOMListNumber(), nodeB->getClassCName(),  nodeB->getName(), nodeB->getOMListNumber(), distanceMax, distance);
-
-
-  PRINTF(4)("collideWith\n");
-  PRINTF(5)("Checking OBB %i vs %i: ", this->getIndex(), treeNode->getIndex());
+//   if( distance > distanceMax)
+//     return;
 
   // for now only collide with OBBTreeNodes