Changeset 6921 in orxonox.OLD for branches/current_cd/src/lib/collision_detection/obb_tree_node.cc

Timestamp:

Jan 31, 2006, 11:05:36 PM (19 years ago)

Author:

patrick

Message:

cd: collision algorithm works almost

File:

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

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

@@ -515 +515 @@
 
 
-void OBBTreeNode::collideWith(const BVTreeNode& treeNode, WorldEntity* nodeA, WorldEntity* nodeB)
-{
+void OBBTreeNode::collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB)
+{
+  if( unlikely(treeNode == 1))
+    return;
+
   PRINTF(3)("collideWith\n");
   /* if the obb overlap, make subtests: check which node is realy overlaping  */
@@ -772 +775 @@
     }
 
-    if( this->nodeLeft == NULL || this->nodeRight == NULL)
+    if( this->nodeLeft == NULL && this->nodeRight == NULL)
       depth = 0;
+
     if( !(drawMode & DRAW_SINGLE && depth != 0))
     {
+      PRINTF(0)("debug poly draw: depth: %i, mode: %i\n", depth, drawMode);
+
       Vector cen = this->bvElement->center;
       Vector* axis = this->bvElement->axis;