Changeset 3872 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: animation fix, the AnimationMode was not reset to the start-value when rewinding

Location:

orxonox/trunk/src

Files:

• track_manager.cc (modified) (1 diff)
• util/animation/animation3d.cc (modified) (1 diff)
• util/animation/t_animation.h (modified) (2 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_COSINE);
+  this->textAnimation->addKeyFrame(1.0, 3.0, ANIM_NEG_EXP);
   this->textAnimation->addKeyFrame(0.0, .001);
   this->textAnimation->setInfinity(ANIM_INF_CONSTANT);

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

@@ -72 +72 @@
   this->nextKeyFrame = keyFrameList->nextElement(keyFrameList->firstElement());
   this->localTime = 0.0;
+  this->setAnimFunc(this->currentKeyFrame->animFunc);
 }
 

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

@@ -127 +127 @@
   this->nextKeyFrame = keyFrameList->nextElement(keyFrameList->firstElement());
   this->localTime = 0.0;
+  this->setAnimFunc(this->currentKeyFrame->animFunc);
 }
 
@@ -308 +309 @@
 float tAnimation<T>::exp(float timePassed) const
 {
+  return this->linear(timePassed);
+
 }