Changeset 8145 in orxonox.OLD for trunk/src/util/animation/t_animation.h

Timestamp:

Jun 5, 2006, 11:49:26 AM (18 years ago)

Author:

bensch

Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

File:

• trunk/src/util/animation/t_animation.h (modified) (1 diff)

trunk/src/util/animation/t_animation.h

@@ -242 +242 @@
       break;
     case ANIM_NEG_EXP:
-      {
         this->animFunc = &tAnimation<T>::negExp;
         expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
         break;
-      }
     case ANIM_QUADRATIC:
       this->animFunc = &tAnimation<T>::quadratic;