Changeset 10512 in orxonox.OLD for trunk/src/util/track/track.cc

Timestamp:

Jan 30, 2007, 8:01:19 PM (17 years ago)

Author:

bknecht

Message:

some changes so the vertical scroller will work better

File:

• trunk/src/util/track/track.cc (modified) (3 diffs)

trunk/src/util/track/track.cc

@@ -233 +233 @@
 //         }
 //     }
-   if (this->trackNode)
-     {
+   if (this->trackNode && !this->pause)
+   {
        // tmp save
         float oldTime = this->localTime;
@@ -240 +240 @@
         if(this->mode == 0)
         {
-              if(this->localTime < this->duration)
+              // PRINTF(0)("localTime %f and duration %f", this->localTime, this->duration);
+              if(this->localTime + dt < this->duration)
                 this->localTime += dt;
         }
@@ -250 +251 @@
         }
 
-       Vector tmp = this->calcPos();
-
-
-       Vector dV = tmp - this->trackNode->getAbsCoor();
-       float dx = speed * dt;
-       float ratio = dx / dV.len();
-
-       if( dt > 0.0f)
+       if(oldTime != this->localTime)
        {
-          float newDt = dt * ratio;
-          if(this->pause)
-            newDt = 0;
-          this->localTime = oldTime += newDt;
+           Vector tmp = this->calcPos();
+    
+    
+           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);
+           Quaternion quat = Quaternion(this->calcDir(), v);
+           Quaternion q(-PI/2, v);
+           quat = quat * q;
+    
+           // move trackNode of the track
+           this->trackNode->shiftCoor(tmp - this->trackNode->getAbsCoor());
+           // set direction and roll angle of trackNode
+           this->trackNode->setAbsDir(quat);
        }
-       tmp = this->calcPos();
-
-       Vector v(0.0, 1.0, 0.0);
-       Quaternion quat = Quaternion(this->calcDir(), v);
-       Quaternion q(-PI/2, v);
-       quat = quat * q;
-
-       // move trackNode of the track
-       this->trackNode->shiftCoor(tmp - this->trackNode->getAbsCoor());
-       // set direction and roll angle of trackNode
-       this->trackNode->setAbsDir(quat);
-     }
+    }
 }