Changeset 3720 in orxonox.OLD

Timestamp:

Apr 5, 2005, 1:07:47 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now implemented the speed distribution algorithms

Location:

orxonox/trunk/src

Files:

• simple_animation.cc (modified) (6 diffs)
• simple_animation.h (modified) (1 diff)

orxonox/trunk/src/simple_animation.cc

@@ -20 +20 @@
 #include "stdincl.h"
 #include "p_node.h"
+#include "vector.h"
 
 using namespace std;
@@ -104 +105 @@
    this->currentFrame = NULL;
    this->lastFrame = NULL;
+
+   this->tmpVect = new Vector();
 }
 
@@ -253 +256 @@
     {
       printf("SimpleAnimation::tick(...) - changing Frame");
+      this->lastFrame = this->currentFrame;
       this->currentFrame = this->frames->nextElement(this->currentFrame);
       this->localTime -= this->currentFrame->time;
@@ -258 +262 @@
   
   
-
   /* now animate it */
   switch( this->mode)
     {
     case LINEAR:
-      
+
+      *this->tmpVect = this->currentFrame->getAbsCoor() - this->lastFrame->getAbsCoor();
+      *this->tmpVect = *this->tmpVect * this->localTime / this->currentFrame->time;
+      //this->setAbsCoordinate(this->tmpVect);
       break;
     case EXP:
@@ -269 +275 @@
       break;
     case NEG_EXP:
-      
+      *this->tmpVect = this->currentFrame->getAbsCoor() - this->lastFrame->getAbsCoor();
+      *this->tmpVect = *this->tmpVect * (1 - exp(- this->localTime / this->currentFrame->time));     
       break;
     case SIN:
-      
+      *this->tmpVect = this->currentFrame->getAbsCoor() - this->lastFrame->getAbsCoor();
+      *this->tmpVect = *this->tmpVect * (1 - cos(- this->localTime / this->currentFrame->time));     
       break;
     case COS:
@@ -278 +286 @@
       break;
     case QUADRATIC:
-      
+      *this->tmpVect = this->currentFrame->getAbsCoor() - this->lastFrame->getAbsCoor();      
+      *this->tmpVect = *this->tmpVect * 1/3 * ldexpf(this->localTime, 3);
       break;
     default:

orxonox/trunk/src/simple_animation.h

@@ -69 +69 @@
   PNode* parent;
   
+  Vector* tmpVect;                 //<! this is the temporary vector save place
 
 };