Changeset 10410 in orxonox.OLD for trunk/src

Timestamp:

Jan 27, 2007, 7:30:45 PM (18 years ago)

Author:

patrick

Message:

the track now is been drawn for the camera

Location:

trunk/src

Files:

• util/track/track.cc (modified) (4 diffs)
• util/track/track.h (modified) (1 diff)
• world_entities/camera.cc (modified) (2 diffs)
• world_entities/camera.h (modified) (1 diff)

trunk/src/util/track/track.cc

@@ -133 +133 @@
 {
      this->duration = this->duration/speed;
-     
+
 }
 
@@ -218 +218 @@
             this->localTime = 0;
      }
-     
+
 //   if (this->localTime > this->currentTrackElem->endTime
 //       && this->currentTrackElem->children)
@@ -238 +238 @@
        Vector tmp = this->calcPos();
        //Quaternion quat = Quaternion(this->calcDir(), Vector(this->curve->calcAcc(this->localTime/this->duration).x,1,this->curve->calcAcc(this->localTime/this->duration).z));
-       
+
 
        Vector v(0.0, 1.0, 0.0);
@@ -267 +267 @@
    eventually this will all be packed into a gl-list.
 */
-/*void Track::drawGraph(float dt) const
-{
+void Track::drawGraph(float dt) const
+{
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+
+    glPushAttrib(GL_ENABLE_BIT);
+
+    glDisable(GL_LIGHTING);
+    glDisable(GL_TEXTURE_2D);
+    glDisable(GL_BLEND);
+    glLineWidth(2.0);
+
+
+
+    PNode* node = PNode::getNullParent();
+    glTranslatef (node->getAbsCoor ().x,
+                  node->getAbsCoor ().y,
+                  node->getAbsCoor ().z);
+    Vector tmpRot = node->getAbsDir().getSpacialAxis();
+    glRotatef (node->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
       glBegin(GL_LINE_STRIP);
+        glColor3f(1.0, 1.0, 0.6);
+
         for(float f = 0.0; f < 1.0; f+=dt)
           {
-            // PRINTF(4)("drawing",this->calcPos().x, this->calcPos().y, this->calcPos().z);
+            //PRINTF(0)("drawing",this->calcPos().x, this->calcPos().y, this->calcPos().z);
             Vector tmpVector = this->curve->calcPos(f);
             glVertex3f(tmpVector.x, tmpVector.y, tmpVector.z);
           }
       glEnd();
-}*/
+
+      glPopAttrib();
+
+    glPopMatrix();
+}

trunk/src/util/track/track.h

@@ -34 +34 @@
 
    PNode* getTrackNode();
-   
-//   void drawGraph(float dt) const;
-      
+
+   void drawGraph(float dt = 0.01) const;
+
    //float                 startingTime;         //!< The time at which this Track begins.
    float                 duration;             //!< The time used to cross this Track (curve).

trunk/src/world_entities/camera.cc

@@ -66 +66 @@
 void Camera::init()
 {
+  this->toList( OM_COMMON);
   //this->setName("camera");
   this->target = new CameraTarget();
@@ -225 +226 @@
   //iterate(float dt, translate, target)
   target->translate(dt);
+}
+
+
+void Camera::draw() const
+{
+  if( this->entityTrack != NULL)
+    this->entityTrack->drawGraph();
 }
 

trunk/src/world_entities/camera.h

@@ -75 +75 @@
   Vector* VectorProd(Vector* v1, Vector* v2);
   void Rotate();
+  void draw() const;
   void tick(float dt);
   void apply ();