Changeset 4712 in orxonox.OLD for orxonox/trunk

Timestamp:

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

Author:

patrick

Message:

orxonox/trunk: more draw options

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/bv_tree.h (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (3 diffs)
• subprojects/collision_detection/collision_detection.cc (modified) (4 diffs)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)

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();
     }
   }

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -79 +79 @@
   entityList = new tList<WorldEntity>();
 
-   a = new TestEntity(); a->setName("Clown1");
-   b = new Environment(); a->setName("Clown");
-  //b = new Environment(); b->setName("Jaeger");
+  a = new TestEntity(); a->setName("Clown1");
+  b = new Environment(); b->setName("Jaeger");
   //c = new Terrain();
 
-   b->setRelCoor(0.0, 0.0, -10.0);
+  b->setRelCoor(0.0, 0.0, -10.0);
   //b->setRelDir(Quaternion(-M_PI/2.0f, Vector(0.0, 1.0, 0.0)));
 
@@ -336 +335 @@
 
 
+int drawPoints(GtkWidget* nonInterest, void* widget)
+{
+  if(drawMode & DRAW_POINTS)
+  {
+    int temp = drawMode & DRAW_POINTS;
+    drawMode ^= temp;
+
+  }
+  else
+  {
+    drawMode |= DRAW_POINTS;
+    printf("Drawing OBB Polygons\n");
+  }
+}
+
+
 int treeDepth(GtkWidget* nonInterest, void* widget)
 {
@@ -377 +392 @@
 
 
+      CheckButton* DrawPoints = new CheckButton("Draw Points");
+      DrawPoints->connectSignal("clicked", (void*)DrawPoints, drawPoints);
+      windowBox->fill(DrawPoints);
+
+
       CheckButton* SeperatingPlanes = new CheckButton("SeperatingPlanes");
       SeperatingPlanes->connectSignal("clicked", (void*)SeperatingPlanes, seperatingPlanes);
@@ -382 +402 @@
 
 
-      Slider* TreeDepth = new Slider("TreeDepth", 0, 10);
+      Slider* TreeDepth = new Slider("TreeDepth", 0, 17);
       TreeDepth->connectSignal("value_changed", (void*)TreeDepth, treeDepth);
       windowBox->fill(TreeDepth);

orxonox/trunk/src/world_entities/environment.cc

@@ -35 +35 @@
   this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj"/*"worlds/vulcania.obj"*/, OBJ, RP_CAMPAIGN);
 
-  this->obbTree = new OBBTree(10, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+  this->obbTree = new OBBTree(15, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
 

orxonox/trunk/src/world_entities/test_entity.cc

@@ -32 +32 @@
 
   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
-  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
+  this->obbTree = new OBBTree(7, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
   this->md2Model->debug();
 }