Changeset 3871 in orxonox.OLD

Timestamp:

Apr 18, 2005, 3:41:54 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: sine/cosine reimplemented in t_animation

Location:

orxonox/trunk/src

Files:

• track_manager.cc (modified) (1 diff)
• util/animation/t_animation.h (modified) (6 diffs)

orxonox/trunk/src/track_manager.cc

@@ -394 +394 @@
   // initializing the Animation for the Text.
   this->textAnimation = new tAnimation<Text>(this->trackText, &Text::setBlending);
-  this->textAnimation->addKeyFrame(1.0, 3.0, ANIM_NEG_EXP);
+  this->textAnimation->addKeyFrame(1.0, 3.0, ANIM_COSINE);
   this->textAnimation->addKeyFrame(0.0, .001);
   this->textAnimation->setInfinity(ANIM_INF_CONSTANT);

orxonox/trunk/src/util/animation/t_animation.h

@@ -20 +20 @@
 #ifndef _T_ANIMATION_H
 #define _T_ANIMATION_H
-
 
 #include "animation.h"
@@ -160 +159 @@
     {
       tmpKeyFrame = new KeyFrameF;
+      // when adding the second frame
       if (this->currentKeyFrame == this->nextKeyFrame)
         this->nextKeyFrame = tmpKeyFrame;
       this->keyFrameList->add(tmpKeyFrame);
-
-    }
+    }
+  // when adding the first frame
   else
     {
       tmpKeyFrame = this->keyFrameList->firstElement();
-      bHasKeys = true;
+      this->bHasKeys = true;
       this->setAnimFunc(animFunc);
     }
+
   tmpKeyFrame->value = value;
   tmpKeyFrame->duration = duration;
@@ -196 +197 @@
             this->handleInfinity();
           this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
+
           printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
           this->setAnimFunc(this->currentKeyFrame->animFunc);     
@@ -264 +266 @@
 float tAnimation<T>::linear(float timePassed) const 
 {
-  return this->currentKeyFrame->value + (this->nextKeyFrame->value - this->currentKeyFrame->value) 
+  return this->currentKeyFrame->value + (this->nextKeyFrame->value - this->currentKeyFrame->value)
     * (timePassed / this->currentKeyFrame->duration);
-  //  PRINTF(0)("value is %f, %p %p\n", val, this->currentKeyFrame, this->nextKeyFrame);
-  //  return val;
 }
 
@@ -277 +277 @@
 float tAnimation<T>::sine(float timePassed) const
 {
-  float d = this->currentKeyFrame->value - this->nextKeyFrame->value;
-  float e = 0.5 * d * (1 - cos(M_PI * timePassed / this->currentKeyFrame->duration));
-  return this->currentKeyFrame->value - e;
+  if (timePassed * 2.0 < this->currentKeyFrame->duration)
+    return this->currentKeyFrame->value + (this->nextKeyFrame->value - this->currentKeyFrame->value) 
+      * sin( M_PI * timePassed / this->currentKeyFrame->duration)/2;
+  else 
+    return this->nextKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
+      * sin( M_PI * (1.0 - timePassed / this->currentKeyFrame->duration))/2;
   /*
-  return his->currentKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
-    * sin(timePassed / this->currentKeyFrame->duration * M_PI);
+  printf("::%f::::%f::\n",timePassed/this->currentKeyFrame->duration,retVal);
+  return retVal;
   */
 }
@@ -293 +296 @@
 float tAnimation<T>::cosine(float timePassed) const
 {
-  float d = this->currentKeyFrame->value - this->nextKeyFrame->value;
-  float e = 0.5 * d * (sin(M_PI * timePassed / this->currentKeyFrame->duration));
-  if( timePassed > 0.5*this->currentKeyFrame->duration) e = (d - e);
-  return this->currentKeyFrame->value - e;
-  /*
-  return this->currentKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
-    * cos(timePassed / this->currentKeyFrame->duration * M_PI);
-  */
+  return ((this->nextKeyFrame->value + this->currentKeyFrame->value) +
+    (this->currentKeyFrame->value - this->nextKeyFrame->value) *
+    cos( M_PI * timePassed / this->currentKeyFrame->duration))/2;
 }