Changeset 3732 in orxonox.OLD for orxonox

Timestamp:

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

Author:

patrick

Message:

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

Location:

orxonox/trunk/src

Files:

• simple_animation.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (2 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:

orxonox/trunk/src/story_entities/world.cc

@@ -472 +472 @@
 
             KeyFrame* f1 = new KeyFrame;
-            f1->position = new Vector(10.0, 1.0, 1.0);
+            f1->position = new Vector(10.0, 1.0, -1.0);
             f1->direction = new Quaternion();
             f1->time = 1.0;
-            f1->mode = LINEAR;
+            f1->mode = SIN;
 
 
             KeyFrame* f2 = new KeyFrame;
-            f2->position = new Vector(10.0, 1.0, -1.0);
+            f2->position = new Vector(10.0, 1.0, 1.0);
             f2->direction = new Quaternion();
             f2->time = 1.0;
-            f2->mode = LINEAR;
+            f2->mode = SIN;
 
             KeyFrame* f3 = new KeyFrame;
-            f3->position = new Vector(10.0, 0.0, -1.0);
+            f3->position = new Vector(5.0, 1.0, -1.0);
             f3->direction = new Quaternion();
             f3->time = 1.0;
-            f3->mode = LINEAR;
+            f3->mode = SIN;
 
 
@@ -495 +495 @@
             this->simpleAnimation->addKeyFrame(f1);
             this->simpleAnimation->addKeyFrame(f2);
-            //this->simpleAnimation->addKeyFrame(f3);
+            this->simpleAnimation->addKeyFrame(f3);
             //this->simpleAnimation->addKeyFrame(f2);
             this->simpleAnimation->animatorEnd();