Changeset 3786 in orxonox.OLD for orxonox/branches/textEngine/src/animation.cc

Timestamp:

Apr 13, 2005, 2:17:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: amimate: rewind works

File:

• orxonox/branches/textEngine/src/animation.cc (modified) (5 diffs)

orxonox/branches/textEngine/src/animation.cc

@@ -33 +33 @@
 
   // setting default values
+  this->localTime = 0.0;
   this->animFunc = &Anim::linear;
   this->currentKeyFrame = tmpKeyFrame;
@@ -70 +71 @@
       if (this->currentKeyFrame == this->nextKeyFrame)
         this->nextKeyFrame = tmpKeyFrame;
+      this->keyFrameList->add(tmpKeyFrame);
+
     }
   else
@@ -80 +83 @@
   tmpKeyFrame->animFunc = animFunc;
   
-  this->keyFrameList->add(tmpKeyFrame);
 }
 
@@ -106 +108 @@
       this->animFunc = &Anim::sine;
       break;
-
     }
 }
@@ -112 +113 @@
 
 // animation functions
-float Anim::random(float time) const
+float Anim::random(float timePassed) const
 {
   return (float)rand()/(float)RAND_MAX;
 }
 
-float Anim::constant(float time) const
+float Anim::constant(float timePassed) const
 {
   return this->currentKeyFrame->value;
 }
 
-float Anim::linear(float time) const 
+float Anim::linear(float timePassed) const 
 {
   return this->nextKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value) 
-    * (time*100.0 / this->currentKeyFrame->duration);
+    * (timePassed / this->currentKeyFrame->duration);
   //  PRINTF(0)("value is %f, %p %p\n", val, this->currentKeyFrame, this->nextKeyFrame);
   //  return val;
 }
 
-float Anim::sine(float time) const
+float Anim::sine(float timePassed) const
 {
-
+  
 }