Changeset 5008 in orxonox.OLD for orxonox

Timestamp:

Aug 14, 2005, 2:46:29 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better coloring

Location:

orxonox/trunk/src/lib

Files:

• coord/p_node.cc (modified) (3 diffs)
• coord/p_node.h (modified) (1 diff)
• math/vector.h (modified) (2 diffs)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -657 +657 @@
    displays the PNode at its position with its rotation as a cube.
 */
-void PNode::debugDraw(unsigned int depth, float size) const
+void PNode::debugDraw(unsigned int depth, float size, Vector color) const
 {
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
+  glDisable(GL_LIGHTING);
 
   /* translate */
@@ -671 +672 @@
 
   Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glColor3f(color.x, color.y, color.z);
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
   {
@@ -705 +707 @@
     tIterator<PNode>* iterator = this->children->getIterator();
       //PNode* pn = this->children->enumerate ();
+    Vector childColor =  color - Vector(.0,.3,.3);
     PNode* pn = iterator->nextElement();
     while( pn != NULL)
     {
       if (depth == 0)
-        pn->debugDraw(0, size);
+        pn->debugDraw(0, size, childColor);
       else
-        pn->debugDraw(depth - 1, size);
+        pn->debugDraw(depth - 1, size, childColor);
       pn = iterator->nextElement();
     }
     delete iterator;
   }
+  glEnable(GL_LIGHTING);
 }
 

orxonox/trunk/src/lib/coord/p_node.h

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

orxonox/trunk/src/lib/math/vector.h

@@ -1 +1 @@
 /*!
-    \file vector.h
-  *  A basic 3D math framework
-
-    Contains classes to handle vectors, lines, rotations and planes
+ * @file vector.h
+ * A basic 3D math framework
+ *
+ * Contains classes to handle vectors, lines, rotations and planes
 */
 
@@ -107 +107 @@
 inline float angleRad (const Vector& v1, const Vector& v2) { return acos( v1 * v2 / (v1.len() * v2.len())) * 180/M_PI; };
 
+/** an easy way to create a Random Vector @param sideLength the length of the Vector (x not sqrt(x^2...)) */
+#define VECTOR_RAND(sideLength)  (Vector((float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5) * sideLength)
+
 
 //! Quaternion