Changeset 5007 in orxonox.OLD

Timestamp:

Aug 14, 2005, 2:20:51 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better method to display PNodes

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.cc (modified) (4 diffs)
• lib/coord/p_node.h (modified) (1 diff)
• world_entities/camera.cc (modified) (2 diffs)

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

@@ -559 +559 @@
       PRINTF(5)("PNode::update - %s - (%f, %f, %f)\n", this->getName(), this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
 
+
+      if( this->parentMode & PNODE_LOCAL_ROTATE && this->bRelDirChanged)
+      {
+        /* update the current absDirection - remember * means rotation around sth.*/
+        this->absDirection = this->relDirection * parent->getAbsDir();;
+      }
+
       if(likely(this->parentMode & PNODE_MOVEMENT))
       {
@@ -564 +571 @@
         this->absCoordinate = this->parent->getAbsCoor() + this->relCoordinate;
       }
-
-      if( this->parentMode & PNODE_LOCAL_ROTATE && this->bRelDirChanged)
-      {
-        /* update the current absDirection - remember * means rotation around sth.*/
-        this->absDirection = this->relDirection * parent->getAbsDir();;
-      }
-
-      if( this->parentMode & PNODE_ROTATE_MOVEMENT)
+      else if( this->parentMode & PNODE_ROTATE_MOVEMENT)
       {
         /* update the current absCoordinate */
@@ -657 +657 @@
    displays the PNode at its position with its rotation as a cube.
 */
-void PNode::debugDraw(float size) const
+void PNode::debugDraw(unsigned int depth, float size) const
 {
   glMatrixMode(GL_MODELVIEW);
@@ -701 +701 @@
 
   glPopMatrix();
+  if (depth >= 2 || depth == 0)
+  {
+    tIterator<PNode>* iterator = this->children->getIterator();
+      //PNode* pn = this->children->enumerate ();
+    PNode* pn = iterator->nextElement();
+    while( pn != NULL)
+    {
+      if (depth == 0)
+        pn->debugDraw(0, size);
+      else
+        pn->debugDraw(depth - 1, size);
+      pn = iterator->nextElement();
+    }
+    delete iterator;
+  }
 }
 

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

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

orxonox/trunk/src/world_entities/camera.cc

@@ -144 +144 @@
        this->softReparent("Player");
        this->target->softReparent("Player");
-       this->setRelCoorSoft(4, 0, 0);
-       this->target->setRelCoorSoft(10,0,0);
+       this->setRelCoorSoft(4, 0, 0, 5);
+       this->target->setRelCoorSoft(Vector(10,0,0), 5);
 //      this->target->setRelDirSoft(Quaternion(M_PI/4.0, Vector(0,1,0)));
       break;
@@ -192 +192 @@
 void Camera::apply ()
 {
-  this->target->debugDraw(2);
+  this->target->getParent()->debugDraw(0, 2);
   // switching to Projection Matrix
   glMatrixMode (GL_PROJECTION);