Changeset 10010 in orxonox.OLD for branches/coll_rect.merge/src/lib/collision_detection

Timestamp:

Dec 4, 2006, 4:39:45 PM (18 years ago)

Author:

patrick

Message:

merged the temp branch

Location:

branches/coll_rect.merge/src/lib/collision_detection

Files:

• aabb_tree_node.cc (modified) (2 diffs)
• obb_tree_node.cc (modified) (3 diffs)

branches/coll_rect.merge/src/lib/collision_detection/aabb_tree_node.cc

@@ -17 +17 @@
 #include "aabb_tree_node.h"
 #include "aabb.h"
-
 #include "bv_tree.h"
+
+#include "collision_tube.h"
 
 #include "matrix.h"
@@ -532 +533 @@
         (treeNode->nodeRight == NULL && treeNode->nodeLeft == NULL)) )
     {
-      nodeA->registerCollision(nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
+      CoRe::CollisionTube::getInstance()->registerCollisionEvent( nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
     }
 

branches/coll_rect.merge/src/lib/collision_detection/obb_tree_node.cc

@@ -18 +18 @@
 #include "obb_tree.h"
 #include "obb.h"
+
+#include "collision_tube.h"
 
 #include "matrix.h"
@@ -477 +479 @@
     return;
 
+  if( !CoRe::CollisionTube::getInstance()->isReactive( *nodeA, *nodeB) )
+    return;
+
 //   float distanceMax = this->bvElement->radius + ((OBBTreeNode*)treeNode)->bvElement->radius;
 //   float distance = fabs((nodeA->getAbsCoor() - nodeB->getAbsCoor()).len());
@@ -566 +571 @@
         (treeNode->nodeRight == NULL && treeNode->nodeLeft == NULL)) )
     {
-//       PRINTF(0)("----------------------------------------------\n\n\n\n\n\n--------------------------------\n\n\n");
-      nodeA->registerCollision(nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
+      PRINTF(0)("----------------------------------------------\n\n\n\n\n\n--------------------------------\n\n\n");
+      CoRe::CollisionTube::getInstance()->registerCollisionEvent( nodeA, nodeB, (BoundingVolume*)this->bvElement, (BoundingVolume*)treeNode->bvElement);
     }