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

Timestamp:

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

Author:

patrick

Message:

merged the temp branch

File:

• branches/coll_rect.merge/src/lib/collision_detection/aabb_tree_node.cc (modified) (2 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);
     }