Changeset 3028 in orxonox.OLD for orxonox/branches/bezierTrack/src/track.cc

Timestamp:

Nov 30, 2004, 2:50:59 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/bezierTrack: now Camera follows Path. heavy cleanUp of not used stuff like elyptical Camera and so on…

File:

• orxonox/branches/bezierTrack/src/track.cc (modified) (7 diffs)

orxonox/branches/bezierTrack/src/track.cc

@@ -17 +17 @@
 
 #include "track.h"
-  float t = .0;
 
 using namespace std;
@@ -28 +27 @@
   this->next = NULL;
   this->previous = NULL;
+  mainTime = .0;
+
 
   curve = BezierCurve();
@@ -62 +63 @@
 }
 
+Vector Track::getPos (void)
+{
+  return curve.calcPos (mainTime);
+}
 
 Vector Track::getPos (float t)
@@ -67 +72 @@
   return curve.calcPos (t);
 }
+
+Vector Track::getDir (void)
+{
+  return curve.calcDir (mainTime);
+}
+
 Vector Track::getDir (float t)
 {
   return curve.calcDir (t);
+}
+
+Quaternion Track::getQuat (void)
+{
+  return curve.calcQuat (mainTime);
+}
+Quaternion Track::getQuat (float t)
+{
+  return curve.calcQuat (t);
 }
 
@@ -88 +108 @@
   //  float r = (lookat->dist)*PI / l;
   // camplc->r = trace.r + (trace.a * ((lookat->dist-10.0) / l)) + Vector(0,0,5.0);
-  camplc->pos = curve.calcPos(t) + (curve.calcDir(t)* ((lookat->dist-10.0)/t)) + Vector(-5,0,5);
-                                 
+  
+  //  camplc->pos = curve.calcPos(t) + (curve.calcDir(t)* ((lookat->dist-10.0)/t)) + Vector(-5,0,5);
+  camplc->pos = curve.calcPos(mainTime) + (curve.calcDir(mainTime) * 5) + Vector (0,0,5);
+  
   Vector w(0.0,0.0,0.0);
   //  w=Vector(0,0,0) - ((trace.r + (trace.a * ((lookat->dist) / l)) - camplc->r));
-  w = Vector(0,0,0) - (((curve.calcPos(t)) + ((curve.calcDir(t)) * ((lookat->dist) / t)) - camplc->pos));
+  w = Vector(0,0,0) - (((curve.calcPos(mainTime)) + ((curve.calcDir(mainTime)) * ((lookat->dist) / mainTime)) - camplc->pos));
   //Vector up(0.0,sin(r),cos(r)); // corrupt...
   Vector up(0.0, 0.0, 1.0);
@@ -118 +140 @@
 bool Track::map_coords (Location* loc, Placement* plc)
 {
-  t+=.0001;
-  //  printf ("%f\n", t);
-  //  if (t > 1) t =0;
-  //  printf ("Pos: %f, %f, %f\n", curve.calcPos(t).x, curve.calcPos(t).y, curve.calcPos(t).z); 
-  //Line trace(*offset, *end - *offset);
-  //    float l = trace.len ();
-        
-        /* change to the next track? */
-        //      if( loc->dist > l)
-        //{
-        //      loc->dist -= l;
-        //      loc->part = nextID;
-                //FIXME: loc->track = this;
-                //return true;
-                //}
-        
+  this->setPosition (curve.calcPos (mainTime), WORLD);
+  this->setRotation (curve.calcQuat (mainTime), WORLD);
+  //  printf ("x: %f; y:%f; z:%f\n", getRotation(WORLD).v.x, getRotation(WORLD).v.y, getRotation(WORLD).v.z); 
+
         /* this quaternion represents the rotation from start-vector (0,0,1) to the direction of
          * the track */
-        Quaternion dir(curve.calcDir(t), Vector(0,0,1)); 
+        Quaternion dir(curve.calcDir(mainTime), Vector(0,0,1)); 
 
-        plc->pos = curve.calcPos(t) + (curve.calcDir(t) * ((loc->dist) / t)) + /*dir.apply*/(loc->pos);
-        plc->rot = dir * loc->rot;
+        plc->pos = this->getPosition(WORLD);// curve.calcPos(t) + (curve.calcDir(t) * ((loc->dist) / t)) + /*dir.apply*/(loc->pos);
+        plc->rot = this->getRotation(WORLD);dir * loc->rot;
         
         return false;
@@ -174 +184 @@
 void Track::tick (float deltaT)
 {
+  mainTime += deltaT/10;
 }