Changeset 3832 in orxonox.OLD for orxonox/trunk/src/animation.h

Timestamp:

Apr 14, 2005, 1:16:31 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: animation class functions implemented, list enhanced

File:

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

orxonox/trunk/src/animation.h

@@ -29 +29 @@
 #include "list.h"
 // FORWARD DEFINITION
+
+#define DELTA_X 0.05  //!< the percentag of the distance that doesnt have to be done by neg_exp (asymptotical) ~ maschinendelta
 
 typedef enum ANIM_FUNCTION {ANIM_CONSTANT,
@@ -146 +148 @@
 
  private:
+  float expFactor;
   T* object;
   void (T::*funcToAnim)(float);
@@ -258 +261 @@
                 break;
               }
-          this->currentKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
+          //this->currentKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
+          this->currentKeyFrame = this->nextKeyFrame;
           this->nextKeyFrame = this->keyFrameList->nextElement(this->nextKeyFrame);
           printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
@@ -291 +295 @@
       break;
     case ANIM_NEG_EXP:
-      this->animFunc = &tAnim<T>::negExp;
-      break;
+      {
+        this->animFunc = &tAnim<T>::negExp;
+        float d = fabs(this->currentKeyFrame->value - this->nextKeyFrame->value);
+        expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
+        break;
+      }
     case ANIM_QUADRATIC:
       this->animFunc = &tAnim<T>::quadratic;
@@ -319 +327 @@
 float tAnim<T>::linear(float timePassed) const 
 {
-  return this->nextKeyFrame->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);
@@ -330 +338 @@
   float d = this->currentKeyFrame->value - this->nextKeyFrame->value;
   float e = 0.5 * d * (1 - cos(M_PI * timePassed / this->currentKeyFrame->duration));
-  //printf("d=%f, t=%f, T=%f\n", d, timePassed, this->currentKeyFrame->duration);
+  return this->currentKeyFrame->value - e;
+  /*
+  return his->currentKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
+    * sin(timePassed / this->currentKeyFrame->duration * M_PI);
+  */
+}
+
+template<class T>
+float tAnim<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)
-    * sin(timePassed / this->currentKeyFrame->duration * M_PI);
+    * cos(timePassed / this->currentKeyFrame->duration * M_PI);
   */
 }
 
 template<class T>
-float tAnim<T>::cosine(float timePassed) const
-{
-  return this->currentKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
-    * cos(timePassed / this->currentKeyFrame->duration * M_PI);
-}
-
-template<class T>
 float tAnim<T>::exp(float timePassed) const
 {
-
 }
 
@@ -354 +366 @@
 float tAnim<T>::negExp(float timePassed) const
 {
-
+  float d = this->currentKeyFrame->value - this->nextKeyFrame->value;
+  float e = d * (1.0 - expf(- timePassed * expFactor));
+  return  this->currentKeyFrame->value - e;
 }