Changeset 10454 in orxonox.OLD for trunk/src

Timestamp:

Jan 28, 2007, 6:35:43 PM (18 years ago)

Author:

patrick

Message:

track now got constant speed

Location:

trunk/src/util/track

Files:

• track.cc (modified) (3 diffs)
• track.h (modified) (1 diff)

trunk/src/util/track/track.cc

@@ -132 +132 @@
 {
      this->duration = this->duration/speed;
-
+     this->speed = speed;
 }
 
@@ -206 +206 @@
 //     this->jumpTo(this->localTime);
 //   if (this->localTime <= this->maxTime)
-     if(this->mode == 0)
-     {
-          if(this->localTime < this->duration)
-             this->localTime += dt;
-     }
-     else
-     {
-         this->localTime += dt;
-         if(this->localTime >= this->duration)
-            this->localTime = 0;
-     }
+
 
 //   if (this->localTime > this->currentTrackElem->endTime
@@ -235 +225 @@
    if (this->trackNode)
      {
+       // tmp save
+        float oldTime = this->localTime;
+
+        if(this->mode == 0)
+        {
+              if(this->localTime < this->duration)
+                this->localTime += dt;
+        }
+        else
+        {
+            this->localTime += dt;
+            if(this->localTime >= this->duration)
+                this->localTime = 0;
+        }
+
        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 dV = tmp - this->trackNode->getAbsCoor();
+       float dx = speed * dt;
+       float ratio = dx / dV.len();
+
+       if( dt > 0.0f)
+       {
+          float newDt = dt * ratio;
+          this->localTime = oldTime += newDt;
+       }
+       tmp = this->calcPos();
 
        Vector v(0.0, 1.0, 0.0);

trunk/src/util/track/track.h

@@ -38 +38 @@
 
    //float                 startingTime;         //!< The time at which this Track begins.
+   float                 speed;
    float                 duration;             //!< The time used to cross this Track (curve).
    float                 endTime;              //!< The time at which this Track ends.