Changeset 3732 in orxonox.OLD for orxonox/trunk/src/simple_animation.cc

Timestamp:

Apr 6, 2005, 10:48:58 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: SimpleAnimation - now sinusoidal velocity distribution works also.

File:

• orxonox/trunk/src/simple_animation.cc (modified) (3 diffs)

orxonox/trunk/src/simple_animation.cc

@@ -263 +263 @@
       this->localTime -= this->currentFrame->time;
 
-      this->currentFrame->object->setRelCoor(this->currentFrame->position);
+      this->currentFrame->object->setRelCoor(*this->currentFrame->position);
       *this->lastPosition = *this->currentFrame->position;
 
       this->lastFrame = this->currentFrame;
       this->currentFrame = this->frames->nextElement(this->currentFrame);
+      this->mode = this->currentFrame->mode;
     }
 
@@ -275 +276 @@
     case LINEAR:
 
-      *this->tmpVect = *this->lastFrame->position - *this->currentFrame->position;
+      *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
       *this->tmpVect = *this->tmpVect * this->localTime / this->currentFrame->time;
-      //this->currentFrame->object->shiftCoor(*this->tmpVect - *this->lastPosition);
-      this->currentFrame->object->setRelCoor(*this->currentFrame->position + *this->tmpVect);
+      this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
       *this->lastPosition = *this->tmpVect;
-      //printf("shift vector: ");this->lastPosition->debug();
       break;
     case EXP:
@@ -288 +287 @@
       *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
       *this->tmpVect = *this->tmpVect * (1 - exp(- this->localTime / this->currentFrame->time));     
+      this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
+      *this->lastPosition = *this->tmpVect;
       break;
     case SIN:
       *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-      *this->tmpVect = *this->tmpVect * (1 - cos(- this->localTime / this->currentFrame->time));     
+      *this->tmpVect = *this->tmpVect * 0.5*(1 - cos(M_PI * this->localTime / this->currentFrame->time));     
+      this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
+      *this->lastPosition = *this->tmpVect;
       break;
     case COS: