Changeset 3734 in orxonox.OLD

Timestamp:

Apr 6, 2005, 11:33:50 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: SimpleAnimation: the NEG_EXP function now gets scaled in a very smooth manner.

Location:

orxonox/trunk/src

Files:

• simple_animation.cc (modified) (2 diffs)
• story_entities/world.cc (modified) (2 diffs)

orxonox/trunk/src/simple_animation.cc

@@ -264 +264 @@
       this->localTime -= this->currentFrame->time;
 
-      this->currentFrame->object->setRelCoor(*this->currentFrame->position);
+      //this->currentFrame->object->setRelCoor(*this->currentFrame->position);
       *this->lastPosition = *this->currentFrame->position;
 
@@ -273 +273 @@
         {
           *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-          deltaT = 1/this->currentFrame->time * logf(1.0 + 100.0/this->tmpVect->len());
+          deltaT = 1/this->currentFrame->time * logf(1.0 + 600.0/this->tmpVect->len());
         }
     }

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(20.0, 1.0, -1.0);
             f1->direction = new Quaternion();
-            f1->time = 0.5;
+            f1->time = 0.3;
             f1->mode = NEG_EXP;
 
 
             KeyFrame* f2 = new KeyFrame;
-            f2->position = new Vector(10.0, 1.0, 1.0);
+            f2->position = new Vector(10.0, 1.0, 5.0);
             f2->direction = new Quaternion();
             f2->time = 0.5;
@@ -485 +485 @@
 
             KeyFrame* f3 = new KeyFrame;
-            f3->position = new Vector(5.0, 1.0, -1.0);
+            f3->position = new Vector(5.0, 2.0, -1.0);
             f3->direction = new Quaternion();
             f3->time = 0.5;