Changeset 4671 in orxonox.OLD

Timestamp:

Jun 23, 2005, 6:54:34 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the blended boxes get rendered correctly

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/obb_tree.cc (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (3 diffs)
• subprojects/collision_detection/collision_detection.cc (modified) (3 diffs)

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

@@ -51 +51 @@
     transparentMaterial[i] = new Material();
     transparentMaterial[i]->setIllum(3);
-    transparentMaterial[i]->setTransparency(0.5);
+    transparentMaterial[i]->setTransparency(0.2);
   }
   transparentMaterial[0]->setAmbient(0.0, 0.3, 0.0);

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

@@ -761 +761 @@
     glEnd();
 
+
+    if( drawMode & DRAW_BV_BLENDED)
+    {
+      glBegin(GL_QUADS);
+      glVertex3f(cen.x - axis[0].x * len[0] + axis[1].x * len[1] - axis[2].x * len[2],
+                 cen.y - axis[0].y * len[0] + axis[1].y * len[1] - axis[2].y * len[2],
+                 cen.z - axis[0].z * len[0] + axis[1].z * len[1] - axis[2].z * len[2]);
+      glVertex3f(cen.x + axis[0].x * len[0] + axis[1].x * len[1] - axis[2].x * len[2],
+                 cen.y + axis[0].y * len[0] + axis[1].y * len[1] - axis[2].y * len[2],
+                 cen.z + axis[0].z * len[0] + axis[1].z * len[1] - axis[2].z * len[2]);
+      glVertex3f(cen.x + axis[0].x * len[0] - axis[1].x * len[1] - axis[2].x * len[2],
+                 cen.y + axis[0].y * len[0] - axis[1].y * len[1] - axis[2].y * len[2],
+                 cen.z + axis[0].z * len[0] - axis[1].z * len[1] - axis[2].z * len[2]);
+      glVertex3f(cen.x - axis[0].x * len[0] - axis[1].x * len[1] - axis[2].x * len[2],
+                 cen.y - axis[0].y * len[0] - axis[1].y * len[1] - axis[2].y * len[2],
+                 cen.z - axis[0].z * len[0] - axis[1].z * len[1] - axis[2].z * len[2]);
+      glEnd();
+
+      glBegin(GL_QUADS);
+      glVertex3f(cen.x - axis[0].x * len[0] + axis[1].x * len[1] + axis[2].x * len[2],
+                 cen.y - axis[0].y * len[0] + axis[1].y * len[1] + axis[2].y * len[2],
+                 cen.z - axis[0].z * len[0] + axis[1].z * len[1] + axis[2].z * len[2]);
+      glVertex3f(cen.x + axis[0].x * len[0] + axis[1].x * len[1] + axis[2].x * len[2],
+                 cen.y + axis[0].y * len[0] + axis[1].y * len[1] + axis[2].y * len[2],
+                 cen.z + axis[0].z * len[0] + axis[1].z * len[1] + axis[2].z * len[2]);
+      glVertex3f(cen.x + axis[0].x * len[0] - axis[1].x * len[1] + axis[2].x * len[2],
+                 cen.y + axis[0].y * len[0] - axis[1].y * len[1] + axis[2].y * len[2],
+                 cen.z + axis[0].z * len[0] - axis[1].z * len[1] + axis[2].z * len[2]);
+      glVertex3f(cen.x - axis[0].x * len[0] - axis[1].x * len[1] + axis[2].x * len[2],
+                 cen.y - axis[0].y * len[0] - axis[1].y * len[1] + axis[2].y * len[2],
+                 cen.z - axis[0].z * len[0] - axis[1].z * len[1] + axis[2].z * len[2]);
+      glEnd();
+    }
+
+
     if( drawMode & DRAW_BV_BLENDED)
       this->obbTree->getMaterial(treeIndex)->select();
@@ -771 +806 @@
     if( !(drawMode & DRAW_SINGLE && depth != 0))
     {
+      if( drawMode & DRAW_BV_BLENDED)
+        this->obbTree->getTransparentMaterial(treeIndex)->select();
+
     /* now draw the separation plane */
     Vector a1 = this->bvElement->axis[(this->longestAxisIndex + 1)%3];
@@ -783 +821 @@
     glVertex3f(c.x + a1.x * l1 - a2.x * l2, c.y + a1.y * l1- a2.y * l2, c.z + a1.z * l1 - a2.z * l2);
     glEnd();
+
+    if( drawMode & DRAW_BV_BLENDED)
+      this->obbTree->getMaterial(treeIndex)->select();
+
     }
   }

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

@@ -232 +232 @@
 }
 
+
+int blendedBox(GtkWidget* nonInterest, void* widget)
+{
+  if(drawMode & DRAW_BV_BLENDED)
+  {
+    int temp = drawMode & DRAW_BV_BLENDED;
+    drawMode ^= temp;
+    printf("Removing OBB Polygons\n");
+  }
+  else
+  {
+    drawMode |= DRAW_BV_BLENDED;
+    printf("Drawing OBB Polygons\n");
+  }
+}
+
+
 int treeDepth(GtkWidget* nonInterest, void* widget)
 {
@@ -258 +275 @@
     Box* windowBox = new Box('v');
     {
-      CheckButton* BoxPolygons = new CheckButton("BoxPolygons");
+      CheckButton* BoxPolygons = new CheckButton("Draw OBB Polygons");
       BoxPolygons->connectSignal("clicked", (void*)BoxPolygons, boxPolygons);
       windowBox->fill(BoxPolygons);
+
+
+      CheckButton* BlendedBox = new CheckButton("Draw OBB Blended");
+      BlendedBox->connectSignal("clicked", (void*)BlendedBox, blendedBox);
+      windowBox->fill(BlendedBox);
 
 
@@ -266 +288 @@
       SeperatingPlanes->connectSignal("clicked", (void*)SeperatingPlanes, seperatingPlanes);
       windowBox->fill(SeperatingPlanes);
+
 
       Slider* TreeDepth = new Slider("TreeDepth", 0, 5);