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

Timestamp:

Jun 11, 2005, 12:55:48 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: setClassID implemented in all files

File:

• orxonox/trunk/src/util/animation/t_animation.h (modified) (10 diffs)

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

@@ -14 +14 @@
 */
 
-/*! 
+/*!
     \file t_animation.h
 */
@@ -80 +80 @@
 */
 template<class T>
-tAnimation<T>::tAnimation (T* object, void (T::*funcToAnim)(float)) 
+tAnimation<T>::tAnimation (T* object, void (T::*funcToAnim)(float))
 {
   // create a new List
@@ -100 +100 @@
 /**
    \brief standard deconstructor
-   
+
    deletes all the Keyframes
 */
 template<class T>
-tAnimation<T>::~tAnimation () 
+tAnimation<T>::~tAnimation ()
 {
   // delete all the KeyFrames
@@ -158 +158 @@
 
   KeyFrameF* tmpKeyFrame;
-    
+
   // when adding the first frame
   if (this->keyFrameCount == 0)
@@ -170 +170 @@
       // when adding the second frame
       if (this->currentKeyFrame == this->nextKeyFrame)
-        this->nextKeyFrame = tmpKeyFrame;
+        this->nextKeyFrame = tmpKeyFrame;
       this->keyFrameList->add(tmpKeyFrame);
     }
@@ -191 +191 @@
       this->localTime += dt;
       if (localTime >= this->currentKeyFrame->duration)
-        {
-          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();
-        }
-      
+        {
+          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();
+        }
+
       (this->object->*(funcToAnim))((this->*animFunc)(this->localTime));
     }
@@ -243 +243 @@
     case ANIM_NEG_EXP:
       {
-        this->animFunc = &tAnimation<T>::negExp;
-        expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
-        break;
+        this->animFunc = &tAnimation<T>::negExp;
+        expFactor =  - 1.0 / this->currentKeyFrame->duration * logf(DELTA_X);
+        break;
       }
     case ANIM_QUADRATIC:
@@ -273 +273 @@
 */
 template<class T>
-float tAnimation<T>::linear(float timePassed) const 
+float tAnimation<T>::linear(float timePassed) const
 {
   return this->currentKeyFrame->value + (this->nextKeyFrame->value - this->currentKeyFrame->value)
@@ -287 +287 @@
 {
   if (timePassed * 2.0 < this->currentKeyFrame->duration)
-    return this->currentKeyFrame->value + (this->nextKeyFrame->value - this->currentKeyFrame->value) 
+    return this->currentKeyFrame->value + (this->nextKeyFrame->value - this->currentKeyFrame->value)
       * sin( M_PI * timePassed / this->currentKeyFrame->duration)/2;
-  else 
+  else
     return this->nextKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
       * sin( M_PI * (1.0 - timePassed / this->currentKeyFrame->duration))/2;
@@ -350 +350 @@
 float tAnimation<T>::random(float timePassed) const
 {
-  return this->currentKeyFrame->value + 
+  return this->currentKeyFrame->value +
     (this->nextKeyFrame->value - this->currentKeyFrame->value) *
     (float)rand()/(float)RAND_MAX;