Changeset 4712 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jun 26, 2005, 10:56:45 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: more draw options

Location:

orxonox/trunk/src/lib/collision_detection

Files:

• bv_tree.h (modified) (1 diff)
• obb_tree_node.cc (modified) (3 diffs)

orxonox/trunk/src/lib/collision_detection/bv_tree.h

@@ -26 +26 @@
   DRAW_BV_BLENDED        = 1<<4,
   DRAW_BV_POLYGON        = 1<<5,
-  DRAW_MODEL             = 1<<6
+  DRAW_MODEL             = 1<<6,
+  DRAW_POINTS            = 1<<7
 };
 

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

@@ -472 +472 @@
   PRINTF(3)("-- Finished Calculating Attributes\n");
 
-
-
-//   PRINTF(3)("\nwe got length: \n");
-  for(int i = 0; i < 3; ++i)
-  {
-    //if( box->halfLength[i] == 0.0)
-    if(fabs(box->halfLength[i]) > 5.0f)
-    {
-      PRINTF(0)("length[%i] = %f\n", i, box->halfLength[i]);
-      PRINTF(0)("MaxLength = %f, MinLength = %f\n", maxLength[i], minLength[i]);
-      PRINTF(0)("\nVertex Data:\n");
-      for(int i = 0; i < length; i++)
-      {
-        PRINTF(0)("vertex %i: %f, %f, %f\n", i, box->vertices[i][0], box->vertices[i][1], box->vertices[i][2]);
-      }
-    }
-  }
 }
 
@@ -626 +609 @@
   /* if the obb overlap, make subtests: check which node is realy overlaping  */
   PRINT(3)("Checking OBB %i vs %i: ", this->getIndex(), treeNode->getIndex());
+  //if( unlikely())
   if( this->overlapTest(this->bvElement, ((OBBTreeNode*)treeNode)->bvElement, nodeA, nodeB))
   {
@@ -780 +764 @@
     if( !(drawMode & DRAW_SINGLE && depth != 0))
     {
+      if( drawMode & DRAW_POINTS)
+        glBegin(GL_POINTS);
       for(int i = 0; i < this->bvElement->numOfVertices; ++i)
       {
-        glPushMatrix();
-        //glMatrixMode(GL_MODELVIEW);
-        //glVertex3f(this->bvElement->vertices[i][0], this->bvElement->vertices[i][1], this->bvElement->vertices[i][2]);
-        glTranslatef(this->bvElement->vertices[i][0], this->bvElement->vertices[i][1], this->bvElement->vertices[i][2]);
-        gluSphere(this->sphereObj, 0.1, 10, 10);
-        //PRINTF(0)("v(%f, %f, %f)\n", this->bvElement->vertices[i][0], this->bvElement->vertices[i][1], this->bvElement->vertices[i][2]);
-        glPopMatrix();
+        if( drawMode & DRAW_POINTS)
+          glVertex3f(this->bvElement->vertices[i][0], this->bvElement->vertices[i][1], this->bvElement->vertices[i][2]);
+        else
+        {
+          glPushMatrix();
+          glTranslatef(this->bvElement->vertices[i][0], this->bvElement->vertices[i][1], this->bvElement->vertices[i][2]);
+          gluSphere(this->sphereObj, 0.1, 10, 10);
+          glPopMatrix();
+        }
       }
+      if( drawMode & DRAW_POINTS)
+        glEnd();
     }
   }