Changeset 3968 in orxonox.OLD

Timestamp:

Apr 26, 2005, 12:37:06 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: animation3d cleaned up some code, deleted some old not used one

Location:

orxonox/trunk/src/util/animation

Files:

• animation3d.cc (modified) (5 diffs)
• t_animation.h (modified) (1 diff)

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

@@ -131 +131 @@
           this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
           this->setAnimFunc(this->currentKeyFrame->animFunc);     
-          
-          if( this->currentKeyFrame->animFunc == ANIM_NEG_EXP)
-            {
-
-            }
         }
-
       /* now animate it */
       (this->*animFunc)(this->localTime);
-      /*
-      switch( this->movMode)
-        {
-        case LINEAR:
-          *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-          *this->tmpVect = *this->tmpVect * this->localTime / this->currentFrame->time;
-          this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
-          *this->lastPosition = *this->tmpVect;
-          break;
-        case EXP:
-              
-          break;
-        case NEG_EXP:
-          *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-          *this->tmpVect = *this->tmpVect * (1 - expf(- this->localTime * this->deltaT));     
-          this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
-          *this->lastPosition = *this->tmpVect;
-          break;
-        case SIN:
-          *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-          *this->tmpVect = *this->tmpVect * 0.5*(1 - cos(M_PI * this->localTime / this->currentFrame->time));     
-          this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
-          *this->lastPosition = *this->tmpVect;
-          break;
-        case COS:
-              
-          break;
-        case QUADRATIC:
-          *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-          *this->tmpVect = *this->tmpVect * 1/3 * ldexpf(this->localTime, 3);
-          break;
-        default:
-          break;
-        }
-      */
+ 
     }
 }
@@ -205 +165 @@
     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:
@@ -282 +233 @@
                             (this->nextKeyFrame->position - this->currentKeyFrame->position) *
                             (1.0 + cos( M_PI * timePassed / this->currentKeyFrame->duration))/2.0);
-
 }
 
@@ -298 +248 @@
 void Animation3D::exp(float timePassed) const
 {
+  PRINTF(0)("no exp animation3d defined\n");
   this->linear(timePassed);
 }
@@ -321 +272 @@
 void Animation3D::quadratic(float timePassed) const
 {
+  PRINTF(0)("no quadratic animation3d defined\n");
   this->linear(timePassed);
 }

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

@@ -235 +235 @@
       {
         this->animFunc = &tAnimation<T>::negExp;
-        float d = fabs(this->currentKeyFrame->value - this->nextKeyFrame->value);
         expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
         break;