Changeset 5383 in orxonox.OLD

Timestamp:

Oct 15, 2005, 8:42:17 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the drawing of the PNode-debug is much better now

Location:

trunk/src/lib

Files:

• coord/p_node.cc (modified) (5 diffs)
• coord/p_node.h (modified) (1 diff)
• shell/shell.cc (modified) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -654 +654 @@
  *  displays some information about this pNode
  * @param depth The deph into which to debug the children of this PNode to.
- * (0: all children will be debugged, 1: only this PNode, 2: this and direct children...)
- * @param level The n-th level of the Node we draw (this is internal and only for nice output)
+ * (0: all children will be debugged, 1: only this PNode, 2: this and direct children, ...)
+ * @param level !! INTERNAL !! The n-th level of the Node we draw (this is internal and only for nice output).
 */
 void PNode::debug(unsigned int depth, unsigned int level) const
@@ -697 +697 @@
 
 /**
-   displays the PNode at its position with its rotation as a cube.
-*/
-void PNode::debugDraw(unsigned int depth, float size, const Vector& color) const
-{
-  glMatrixMode(GL_MODELVIEW);
+ * displays the PNode at its position with its rotation as a cube.
+ * @param  depth The deph into which to debug the children of this PNode to.
+ * (0: all children will be displayed, 1: only this PNode, 2: this and direct children, ...)
+ * @param size the Size of the Box to draw.
+ * @param color the color of the Box to display.
+ * @param level !! INTERNAL !! The n-th level of the Node we draw (this is internal and only for nice output).
+ */
+void PNode::debugDraw(unsigned int depth, float size, const Vector& color, unsigned int level) const
+{
+  if (level == 0)
+  {
+    glPushAttrib(GL_ENABLE_BIT);
+    glMatrixMode(GL_MODELVIEW);
+
+    glDisable(GL_LIGHTING);
+    glDisable(GL_BLEND);
+    glDisable(GL_TEXTURE_2D);
+  }
+
   glPushMatrix();
-  glDisable(GL_LIGHTING);
-
   /* translate */
   glTranslatef (this->getAbsCoor ().x,
@@ -715 +727 @@
   Vector tmpRot = this->getAbsDir().getSpacialAxis();
   glColor3f(color.x, color.y, color.z);
+
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
   {
@@ -745 +758 @@
 
   glPopMatrix();
-  glEnable(GL_LIGHTING);
   if (depth >= 2 || depth == 0)
   {
     Vector childColor =  Color::HSVtoRGB(Color::RGBtoHSV(color)+Vector(20,0,.0));
-
     tIterator<PNode>* iterator = this->children->getIterator();
     PNode* pn = iterator->firstElement();
@@ -755 +766 @@
     {
       if (depth == 0)
-        pn->debugDraw(0, size, childColor);
+        pn->debugDraw(0, size, childColor, level+1);
       else
-        pn->debugDraw(depth - 1, size, childColor);
+        pn->debugDraw(depth - 1, size, childColor, level +1);
       pn = iterator->nextElement();
     }
     delete iterator;
   }
+  if (level == 0)
+    glPopAttrib();
 }
 

trunk/src/lib/coord/p_node.h

@@ -118 +118 @@
 
   void debug (unsigned int depth = 1, unsigned int level = 0) const;
-  void debugDraw(unsigned int depth = 1, float size = 1.0, const Vector& color = Vector(1,1,1)) const;
+  void debugDraw(unsigned int depth = 1, float size = 1.0, const Vector& color = Vector(1, 0, 0), unsigned int level = 0) const;
 
 

trunk/src/lib/shell/shell.cc

@@ -364 +364 @@
     2:
   */
-    lastText->setRelDir2D(-360);
-    lastText->setRelDirSoft2D(0, 5);
+    lastText->setRelDir2D(-90);
+    lastText->setRelDirSoft2D(0, 20);
     lastText->setRelCoor2D(this->calculateLinePosition(0)- Vector(-1000,0,0));
     lastText->setRelCoorSoft2D(this->calculateLinePosition(0),10);