Changeset 5028 in orxonox.OLD for orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

Timestamp:

Aug 15, 2005, 8:59:02 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: changed the collision detection interface again slightly to make it more useable

File:

• orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc (modified) (3 diffs)

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -22 +22 @@
 #include "vector.h"
 #include "abstract_model.h"
-#include "p_node.h"
+#include "world_entity.h"
 
 #include <math.h>
@@ -620 +620 @@
 
 
-void OBBTreeNode::collideWith(BVTreeNode* treeNode, PNode* nodeA, PNode* nodeB)
+void OBBTreeNode::collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB)
 {
   PRINTF(3)("collideWith\n");
@@ -647 +647 @@
        this->nodeRight->collideWith(((OBBTreeNode*)treeNode)->nodeRight, nodeA, nodeB);
       }
-    }
-  }
-}
-
-
-
-bool OBBTreeNode::overlapTest(OBB* boxA, OBB* boxB, PNode* nodeA, PNode* nodeB)
+
+      /* so there is a collision and this is the last box in the tree (i.e. leaf) */
+      if( unlikely(this->nodeRight == NULL && this->nodeLeft == NULL))
+      {
+        //nodeA->collidesWith()
+      }
+    }
+  }
+}
+
+
+
+bool OBBTreeNode::overlapTest(OBB* boxA, OBB* boxB, WorldEntity* nodeA, WorldEntity* nodeB)
 {
   /* first check all axis */