Changeset 4178 in orxonox.OLD for orxonox/branches/physics/src/util/animation/t_animation.h

Timestamp:

May 13, 2005, 11:16:33 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the Trunk into the physics Branche again:
merged with command:
svn merge ../trunk physics -r 3953:HEAD
no important conflicts

Location:

orxonox/branches/physics

Files:

• . (modified) (1 prop)
• src/util/animation/t_animation.h (modified) (4 diffs)

orxonox/branches/physics

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/physics/src/util/animation/t_animation.h

@@ -43 +43 @@
   void setFuncToAnim(T* object, void (T::*funcToAnim)(float));
 
-  void addKeyFrame(float value, float duration, ANIM_FUNCTION animFunc = ANIM_LINEAR);
+  void addKeyFrame(float value, float duration, ANIM_FUNCTION animFunc = ANIM_DEFAULT_FUNCTION);
 
   virtual void rewind();
@@ -154 +154 @@
   if (duration <= 0.0)
     duration = 1.0;
+  if (animFunc == ANIM_NULL)
+    animFunc = ANIM_DEFAULT_FUNCTION;
 
   KeyFrameF* tmpKeyFrame;
@@ -190 +192 @@
       if (localTime >= this->currentKeyFrame->duration)
         {
-          // switching to the next Key-Frame
-          this->localTime -= this->currentKeyFrame->duration;
-
-          this->currentKeyFrame = this->nextKeyFrame;
-          // checking, if we should still Play the animation
-          if (this->currentKeyFrame == this->keyFrameList->lastElement())
-            this->handleInfinity();
-          this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
-
-          printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
-          this->setAnimFunc(this->currentKeyFrame->animFunc);     
+          if (likely(this->keyFramesToPlay != 0))
+            {
+              if (unlikely(this->keyFramesToPlay > 0))
+                --this->keyFramesToPlay;
+              // switching to the next Key-Frame
+              this->localTime -= this->currentKeyFrame->duration;
+              
+              this->currentKeyFrame = this->nextKeyFrame;
+              // checking, if we should still Play the animation
+              if (this->currentKeyFrame == this->keyFrameList->lastElement())
+                this->handleInfinity();
+              this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
+              
+              printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
+              this->setAnimFunc(this->currentKeyFrame->animFunc);         
+            }
+          else
+            this->pause();
         }
       
@@ -235 +244 @@
       {
         this->animFunc = &tAnimation<T>::negExp;
-        float d = fabs(this->currentKeyFrame->value - this->nextKeyFrame->value);
         expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
         break;

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+