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

Timestamp:

Apr 5, 2005, 11:51:15 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: simple animation is moving, but not realy what it should

File:

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

orxonox/trunk/src/simple_animation.cc

@@ -19 +19 @@
 #include "simple_animation.h"
 #include "stdincl.h"
-#include "p_node.h"
 #include "vector.h"
+#include "world_entity.h"
 
 using namespace std;
@@ -51 +51 @@
 
    this->tmpVect = new Vector();
+   this->lastPosition = new Vector();
 }
 
@@ -78 +79 @@
    will be closed with AnimatiorEnd()
 */
-void SimpleAnimation::AnimatorBegin()
+void SimpleAnimation::animatorBegin()
 {
   this->bDescriptive = true;
@@ -90 +91 @@
    will be closed with AnimatiorEnd()
 */
-void SimpleAnimation::AnimatorEnd()
+void SimpleAnimation::animatorEnd()
 {
   this->workingObject = NULL;
@@ -111 +112 @@
    \brief adds a keyframe with properties
    \param the point of the object
-   \param and the orientation of it
+   \param and the direction of it
    \param at this time
 */
-void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* orientation, float time)
+void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* direction, float time)
 {
   if( !this->bDescriptive)
@@ -123 +124 @@
   KeyFrame* frame = new KeyFrame;
   frame->position = point;
-  frame->orientation = orientation;
+  frame->direction = direction;
   frame->time = time;
   frame->mode = DEFAULT_ANIMATION_MODE;
@@ -134 +135 @@
    \brief adds a keyframe with properties
    \param the point of the object
-   \param and the orientation of it
+   \param and the direction of it
    \param at this time
    \param function of the velocity of the movement 
 */
-void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* orientation, float time, movementMode mode)
+void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* direction, float time, movementMode mode)
 {
   if( !this->bDescriptive)
@@ -147 +148 @@
   KeyFrame* frame = new KeyFrame;
   frame->position = point;
-  frame->orientation = orientation;
+  frame->direction = direction;
   frame->time = time;
   frame->mode = mode;
@@ -259 +260 @@
   while( this->localTime > this->currentFrame->time)
     {
-      printf("SimpleAnimation::tick(...) - changing Frame");
+      printf("SimpleAnimation::tick(...) - changing Frame\n");
+      this->localTime -= this->currentFrame->time;
+
+      this->lastPosition = this->currentFrame->position;
       this->lastFrame = this->currentFrame;
       this->currentFrame = this->frames->nextElement(this->currentFrame);
-      this->localTime -= this->currentFrame->time;
     }
   
@@ -273 +276 @@
       *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
       *this->tmpVect = *this->tmpVect * this->localTime / this->currentFrame->time;
-      //this->setAbsCoordinate(this->tmpVect);
+      this->currentFrame->object->shiftCoor(*this->tmpVect - *this->lastPosition);
+      *this->lastPosition = *this->tmpVect;
       break;
     case EXP: