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

Timestamp:

Feb 3, 2006, 9:34:57 AM (18 years ago)

Author:

patrick

Message:

cd: work flush

File:

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

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

@@ -66 +66 @@
   if( OBBTreeNode_sphereObj == NULL)
     OBBTreeNode_sphereObj = gluNewQuadric();
+
+  this->owner = NULL;
 
   /* debug ids */
@@ -565 +567 @@
 
 
-bool OBBTreeNode::overlapTest(const OBB& boxA, const OBB& boxB, WorldEntity* nodeA, WorldEntity* nodeB)
-{
+bool OBBTreeNode::overlapTest(OBB& boxA, OBB& boxB, WorldEntity* nodeA, WorldEntity* nodeB)
+{
+  //HACK remove this again
+  this->owner = nodeA;
   //   if( boxB == NULL || boxA == NULL)
   //     return false;
@@ -677 +681 @@
 
   /* FIXME: there is no collision mark set now */
-  //   boxA.bCollided = true; /* use this ONLY(!!!!) for drawing operations */
-  //   boxB.bCollided = true;
+     boxA.bCollided = true; /* use this ONLY(!!!!) for drawing operations */
+     boxB.bCollided = true;
 
 
@@ -689 +693 @@
 
 
+
+
+
+
+
+/**
+ *
+ * draw the BV tree - debug mode
+ */
 void OBBTreeNode::drawBV(int depth, int drawMode, const Vector& color,  bool top) const
 {
-
-
   /* this function can be used to draw the triangles and/or the points only  */
   if( drawMode & DRAW_MODEL || drawMode & DRAW_ALL)
@@ -778 +789 @@
       depth = 0;
 
-    if( !(drawMode & DRAW_SINGLE && depth != 0))
-    {
-      PRINTF(0)("debug poly draw: depth: %i, mode: %i\n", depth, drawMode);
+    if( depth == 0 /*!(drawMode & DRAW_SINGLE && depth != 0)*/)
+    {
+
 
       Vector cen = this->bvElement->center;
@@ -794 +805 @@
         glColor4f(color.x, color.y, color.z, .5);
       }
+
+      // debug out
+      if( this->obbTree->getOwner() != NULL)
+      {
+        PRINTF(0)("debug poly draw: depth: %i, mode: %i, entity-name: %s, class: %s\n", depth, drawMode, this->obbTree->getOwner()->getName(), this->obbTree->getOwner()->getClassName());
+      }
+      else
+        PRINTF(0)("debug poly draw: depth: %i, mode: %i\n", depth, drawMode);
+
 
       /* draw bounding box */
@@ -902 +922 @@
       }
 
-
       if( drawMode & DRAW_BV_BLENDED)
         glColor3f(color.x, color.y, color.z);
     }
-
   }