Changeset 3733 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 6, 2005, 11:24:17 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: SimpleAnimation - the NEG_EXP function works also now.

Location:

orxonox/trunk/src

Files:

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

orxonox/trunk/src/simple_animation.cc

@@ -52 +52 @@
    this->tmpVect = new Vector();
    this->lastPosition = new Vector();
+   this->deltaT = 0.2;
 }
 
@@ -269 +270 @@
       this->currentFrame = this->frames->nextElement(this->currentFrame);
       this->mode = this->currentFrame->mode;
+      if( this->mode == NEG_EXP)
+        {
+          *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
+          deltaT = 1/this->currentFrame->time * logf(1.0 + 100.0/this->tmpVect->len());
+        }
     }
 
@@ -286 +292 @@
     case NEG_EXP:
       *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
-      *this->tmpVect = *this->tmpVect * (1 - exp(- this->localTime / this->currentFrame->time));     
+      *this->tmpVect = *this->tmpVect * (1 - exp(- this->localTime * this->deltaT));     
       this->currentFrame->object->setRelCoor(*this->lastFrame->position + *this->tmpVect);
       *this->lastPosition = *this->tmpVect;

orxonox/trunk/src/simple_animation.h

@@ -67 +67 @@
 
   static SimpleAnimation* singletonRef;
+  bool bDescriptive;               //<! is true, when AnimatorBegin() was executed but no AnimatorEnd() yet: in describtive mode: pass commands
   bool bRunning;                   //<! is set, when the animation is running
   tList<KeyFrame>* frames;         //<! where keyframes are stored in
@@ -78 +79 @@
   Vector* tmpVect;                 //<! this is the temporary vector save place - 
   WorldEntity* workingObject;      //<! this is a pointer to the current working object that has been selected via selectObject()
-  bool bDescriptive;               //<! is true, when AnimatorBegin() was executed but no AnimatorEnd() yet: in describtive mode: pass commands
+  float deltaT;                    //<! this is a time constant for the movement
+
 };
 

orxonox/trunk/src/story_entities/world.cc

@@ -474 +474 @@
             f1->position = new Vector(10.0, 1.0, -1.0);
             f1->direction = new Quaternion();
-            f1->time = 1.0;
-            f1->mode = SIN;
+            f1->time = 0.5;
+            f1->mode = NEG_EXP;
 
 
@@ -481 +481 @@
             f2->position = new Vector(10.0, 1.0, 1.0);
             f2->direction = new Quaternion();
-            f2->time = 1.0;
-            f2->mode = SIN;
+            f2->time = 0.5;
+            f2->mode = NEG_EXP;
 
             KeyFrame* f3 = new KeyFrame;
             f3->position = new Vector(5.0, 1.0, -1.0);
             f3->direction = new Quaternion();
-            f3->time = 1.0;
-            f3->mode = SIN;
+            f3->time = 0.5;
+            f3->mode = NEG_EXP;