Changeset 3964 in orxonox.OLD for orxonox/trunk/src/util/animation

Timestamp:

Apr 25, 2005, 11:45:57 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented neg_exp function again. better than ever

Location:

orxonox/trunk/src/util/animation

Files:

• animation3d.cc (modified) (3 diffs)
• animation3d.h (modified) (2 diffs)

orxonox/trunk/src/util/animation/animation3d.cc

@@ -134 +134 @@
           if( this->currentKeyFrame->animFunc == ANIM_NEG_EXP)
             {
-              this->tmpVect = this->nextKeyFrame->position - this->currentKeyFrame->position;
-              this->deltaT = 1/this->currentKeyFrame->duration * logf(1.0 + 600.0/this->tmpVect.len());
+
             }
         }
@@ -206 +205 @@
     case ANIM_NEG_EXP:
       this->animFunc = &Animation3D::negExp;
+      //this->tmpVect = this->nextKeyFrame->position - this->currentKeyFrame->position;
+      //this->deltaT = 1/this->currentKeyFrame->duration * logf(1.0 + 600.0/this->tmpVect.len());
+      this->expFactor = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
+        //(this->currentKeyFrame->position - this->nextKeyFrame->position)
+
+      /*
+        float d = fabs(this->currentKeyFrame->value - this->nextKeyFrame->value);
+        expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
+
+      */
       break;
     case ANIM_QUADRATIC:
@@ -284 +293 @@
 void Animation3D::negExp(float timePassed) const
 {
-  this->linear(timePassed);
-}
+  this->object->setRelCoor( this->currentKeyFrame->position +
+                            (this->nextKeyFrame->position - this->currentKeyFrame->position) * 
+                            (1.0 - expf(- timePassed * expFactor)) );
+}
+
+/*
+  float d = this->currentKeyFrame->value - this->nextKeyFrame->value;
+  float e = d * (1.0 - expf(- timePassed * expFactor));
+  return  this->currentKeyFrame->value - e;
+*/
+
 
 /**

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

@@ -8 +8 @@
 #include "vector.h"
 class PNode;
+
+#define DELTA_X_3D 0.05  //!< the percentag of the distance that doesnt have to be done by neg_exp (asymptotical) ~ maschinendelta
 
 //! KeyFrame3D Struct
@@ -60 +62 @@
   Vector tmpVect;        //!< what for??
   float deltaT;          //!< ??
+  float expFactor;
 };