Changeset 4597 in orxonox.OLD for orxonox/trunk/src/util/animation/animation3d.cc

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/animation3d.cc (modified) (13 diffs)

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

@@ -51 +51 @@
 /**
    \brief standard deconstructor
-   
+
    deletes all the Keyframes
 */
@@ -89 +89 @@
 */
 void Animation3D::addKeyFrame(Vector position, Quaternion direction, float duration,
-                              ANIM_FUNCTION animFuncMov, ANIM_FUNCTION animFuncRot)
+                              ANIM_FUNCTION animFuncMov, ANIM_FUNCTION animFuncRot)
 {
   // some small check
@@ -101 +101 @@
 
   KeyFrame3D* tmpKeyFrame;
-    
+
   // when adding the first frame
   if (this->keyFrameCount == 0)
@@ -114 +114 @@
       // when adding the second frame
       if (this->currentKeyFrame == this->nextKeyFrame)
-        this->nextKeyFrame = tmpKeyFrame;
+        this->nextKeyFrame = tmpKeyFrame;
       this->keyFrameList->add(tmpKeyFrame);
     }
@@ -136 +136 @@
 {
   if (this->bRunning)
-    { 
+    {
       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);
-              this->setAnimFuncMov(this->currentKeyFrame->animFuncMov);
-              this->setAnimFuncRot(this->currentKeyFrame->animFuncRot);
-            }
-          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);
+              this->setAnimFuncMov(this->currentKeyFrame->animFuncMov);
+              this->setAnimFuncRot(this->currentKeyFrame->animFuncRot);
+            }
+          else
+            this->pause();
+        }
       /* now animate it */
       (this->*animFuncMov)(this->localTime);
@@ -257 +257 @@
   else
     v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * (2.0 + sin( M_PI * (- timePassed /this->currentKeyFrame->duration)) )/ 2.0;
-  
+
   this->object->shiftCoor(v - this->currentKeyFrame->lastPosition);
   this->currentKeyFrame->lastPosition = v;
@@ -279 +279 @@
   /*
   this->object->setRelCoor( this->nextKeyFrame->position -
-                            (this->nextKeyFrame->position - this->currentKeyFrame->position) *
-                            (1.0 + cos( M_PI * timePassed / this->currentKeyFrame->duration))/2.0);
+                            (this->nextKeyFrame->position - this->currentKeyFrame->position) *
+                            (1.0 + cos( M_PI * timePassed / this->currentKeyFrame->duration))/2.0);
   */
 }
@@ -309 +309 @@
   /*
   this->object->setRelCoor( this->currentKeyFrame->position +
-                            (this->nextKeyFrame->position - this->currentKeyFrame->position) * 
-                            (1.0 - expf(- timePassed * expFactorMov)) );
+                            (this->nextKeyFrame->position - this->currentKeyFrame->position) *
+                            (1.0 - expf(- timePassed * expFactorMov)) );
   */
 }
@@ -334 +334 @@
 {
   /*
-  this->object->setRelCoor(this->currentKeyFrame->position + 
-                           (this->nextKeyFrame->position - this->currentKeyFrame->position) * (float)rand()/(float)RAND_MAX);
+  this->object->setRelCoor(this->currentKeyFrame->position +
+                           (this->nextKeyFrame->position - this->currentKeyFrame->position) * (float)rand()/(float)RAND_MAX);
   this->object->setRelDir(this->currentKeyFrame->direction +
-                          (this->nextKeyFrame->direction - this->currentKeyFrame->direction)* (float)rand()/(float)RAND_MAX);
+                          (this->nextKeyFrame->direction - this->currentKeyFrame->direction)* (float)rand()/(float)RAND_MAX);
   */
 }
@@ -401 +401 @@
 void Animation3D::rLinear(float timePassed) const
 {
-  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction, 
-                                     this->currentKeyFrame->direction, 
-                                     timePassed/this->currentKeyFrame->duration) );
+  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
+                                     this->currentKeyFrame->direction,
+                                     timePassed/this->currentKeyFrame->duration) );
 }
 
@@ -420 +420 @@
     scale = 1.0 - sin( M_PI * timePassed / this->currentKeyFrame->duration);
 
-  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction, 
-                                     this->currentKeyFrame->direction, 
-                                     scale) );
+  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
+                                     this->currentKeyFrame->direction,
+                                     scale) );
 }
 
@@ -435 +435 @@
 {
   float scale = cos(M_PI * timePassed / this->currentKeyFrame->duration);
-  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction, 
-                                     this->currentKeyFrame->direction, 
-                                     scale) );
+  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
+                                     this->currentKeyFrame->direction,
+                                     scale) );
 }
 
@@ -458 +458 @@
 {
   float scale = (1.0 - expf(- timePassed * expFactorRot));
-  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction, 
-                                     this->currentKeyFrame->direction, 
-                                     scale) );
+  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
+                                     this->currentKeyFrame->direction,
+                                     scale) );
 }