Changeset 3829 in orxonox.OLD

Timestamp:

Apr 14, 2005, 2:33:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the keyframe should also change the animation-function

File:

• orxonox/trunk/src/animation.h (modified) (5 diffs)

orxonox/trunk/src/animation.h

@@ -236 +236 @@
   tmpKeyFrame->duration = duration;
   tmpKeyFrame->animFunc = animFunc;
-  
 }
 
@@ -261 +260 @@
           this->nextKeyFrame = this->keyFrameList->nextElement(this->nextKeyFrame);
           printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
-          
-          
+          this->setAnimFunc(this->currentKeyFrame->animFunc);     
         }
       
@@ -294 +292 @@
       this->animFunc = &tAnim<T>::negExp;
       break;
-    case ANIM_SINE:
+    case ANIM_QUADRATIC:
       this->animFunc = &tAnim<T>::quadratic;
       break;
@@ -329 +327 @@
 float tAnim<T>::sine(float timePassed) const
 {
-  return this->currentkeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
+  return this->currentKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
     * sin(timePassed / this->currentKeyFrame->duration * M_PI);
 }
@@ -336 +334 @@
 float tAnim<T>::cosine(float timePassed) const
 {
-  return this->currentkeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
+  return this->currentKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
     * cos(timePassed / this->currentKeyFrame->duration * M_PI);
 }