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

Timestamp:

Nov 3, 2005, 10:22:30 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: BV-nodes are now renddered more efficiently.

File:

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

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -25 +25 @@
 
 #include <math.h>
+#include "color.h"
 
 #include "stdincl.h"
-
 #include "lin_alg.h"
 #include "glincl.h"
@@ -806 +806 @@
 
 
-void OBBTreeNode::drawBV(int depth, int drawMode)
+void OBBTreeNode::drawBV(int depth, int drawMode, const Vector& color,  bool top) const
 {
-  this->obbTree->getMaterial(treeIndex)->select();
 
   /* draw the model itself, there is some problem concerning this: the vertices are drawn multiple times */
@@ -834 +833 @@
   }
 
+  if (top)
+  {
+    glPushAttrib(GL_ENABLE_BIT);
+    glDisable(GL_LIGHTING);
+    glDisable(GL_TEXTURE_2D);
+    glDisable(GL_BLEND);
+  }
+  glColor3f(color.x, color.y, color.z);
+
 
   /* draw world axes */
@@ -839 +847 @@
   {
     glBegin(GL_LINES);
-    glColor3f(0.0, 0.4, 0.3);
+    glColor3f(1.0, 0.0, 0.0);
     glVertex3f(0.0, 0.0, 0.0);
     glVertex3f(3.0, 0.0, 0.0);
 
+    glColor3f(0.0, 1.0, 0.0);
     glVertex3f(0.0, 0.0, 0.0);
     glVertex3f(0.0, 3.0, 0.0);
 
+    glColor3f(0.0, 0.0, 1.0);
     glVertex3f(0.0, 0.0, 0.0);
     glVertex3f(0.0, 0.0, 3.0);
@@ -890 +900 @@
 
     if( this->bvElement->bCollided)
-      this->obbTree->getCollisionMaterial()->select();
+    {
+      glColor3f(1.0, 1.0, 1.0); // COLLISION COLOR
+    }
     else if( drawMode & DRAW_BV_BLENDED)
-      this->obbTree->getTransparentMaterial(treeIndex)->select();
+    {
+      glColor4f(color.x, color.y, color.z, .5);
+    }
 
 
@@ -1005 +1019 @@
 
     if( drawMode & DRAW_BV_BLENDED)
-      this->obbTree->getMaterial(treeIndex)->select();
+      glColor3f(color.x, color.y, color.z);
     }
 
@@ -1016 +1030 @@
     {
       if( drawMode & DRAW_BV_BLENDED)
-        this->obbTree->getTransparentMaterial(treeIndex)->select();
+        glColor4f(color.x, color.y, color.z, .6);
 
     /* now draw the separation plane */
@@ -1032 +1046 @@
 
     if( drawMode & DRAW_BV_BLENDED)
-      this->obbTree->getMaterial(treeIndex)->select();
-
-    }
-  }
-
-
-
-  if( this->nodeLeft != NULL && depth != 0 )
-    this->nodeLeft->drawBV(depth - 1, drawMode);
-  if( this->nodeRight != NULL && depth != 0)
-    this->nodeRight->drawBV(depth - 1, drawMode);
-
+      glColor4f(color.x, color.y, color.z, 1.0);
+
+    }
+  }
+
+
+
+  if (depth > 0)
+  {
+    Vector childColor =  Color::HSVtoRGB(Color::RGBtoHSV(color)+Vector(20,0,.0));
+    if( this->nodeLeft != NULL)
+      this->nodeLeft->drawBV(depth - 1, drawMode, childColor, false);
+    if( this->nodeRight != NULL)
+      this->nodeRight->drawBV(depth - 1, drawMode, childColor, false);
+  }
   this->bvElement->bCollided = false;
+
+  if (top)
+    glPopAttrib();
 }