Changeset 5487 in orxonox.OLD

Timestamp:

Nov 4, 2005, 3:34:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: blended rendering works again in the CollisionDetection Debug-Draw

Location:

trunk/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (5 diffs)
• subprojects/collision_detection/collision_test_entity.cc (modified) (1 diff)

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -838 +838 @@
     glDisable(GL_LIGHTING);
     glDisable(GL_TEXTURE_2D);
-    glDisable(GL_BLEND);
   }
   glColor3f(color.x, color.y, color.z);
@@ -891 +890 @@
   if( drawMode & DRAW_BV_POLYGON || drawMode & DRAW_ALL || drawMode & DRAW_BV_BLENDED)
   {
+    if (top)
+    {
+      glEnable(GL_BLEND);
+      glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    }
+
     if(this->nodeLeft == NULL || this->nodeRight == NULL)
       depth = 0;
@@ -901 +906 @@
     if( this->bvElement->bCollided)
     {
-      glColor3f(1.0, 1.0, 1.0); // COLLISION COLOR
+      glColor4f(1.0, 1.0, 1.0, .5); // COLLISION COLOR
     }
     else if( drawMode & DRAW_BV_BLENDED)
@@ -907 +912 @@
       glColor4f(color.x, color.y, color.z, .5);
     }
-
-
 
     /* draw bounding box */
@@ -1055 +1058 @@
   if (depth > 0)
   {
-    Vector childColor =  Color::HSVtoRGB(Color::RGBtoHSV(color)+Vector(20,0,.0));
+    Vector childColor1 =  Color::HSVtoRGB(Color::RGBtoHSV(color)+Vector(10.0,0.0,0.0));
+    Vector childColor2 =  Color::HSVtoRGB(Color::RGBtoHSV(color)-Vector(10.0,0.0,0.0));
     if( this->nodeLeft != NULL)
-      this->nodeLeft->drawBV(depth - 1, drawMode, childColor, false);
+      this->nodeLeft->drawBV(depth - 1, drawMode, childColor1, false);
     if( this->nodeRight != NULL)
-      this->nodeRight->drawBV(depth - 1, drawMode, childColor, false);
+      this->nodeRight->drawBV(depth - 1, drawMode, childColor2, false);
   }
   this->bvElement->bCollided = false;

trunk/src/subprojects/collision_detection/collision_test_entity.cc

@@ -36 +36 @@
   this->loadModel("models/ships/fighter.obj");
 
-  if(this->obbTree == NULL)
-    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+  this->buildObbTree(10);
 }