Changeset 3981 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 26, 2005, 3:16:28 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: animatin3d changed linear mov mode to shiftCoor implementation

Location:

orxonox/trunk/src/util/animation

Files:

• animation3d.cc (modified) (3 diffs)
• animation3d.h (modified) (1 diff)

orxonox/trunk/src/util/animation/animation3d.cc

@@ -117 +117 @@
 
   tmpKeyFrame->position = position;
+  //tmpKeyFrame->lastPosition = position;
   tmpKeyFrame->direction = direction;
   tmpKeyFrame->duration = duration;
@@ -170 +171 @@
     case ANIM_LINEAR:
       this->animFuncMov = &Animation3D::mLinear;
+      this->object->setRelCoor(this->currentKeyFrame->position);
+      this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_SINE:
@@ -219 +222 @@
 void Animation3D::mLinear(float timePassed) const
 {
-  this->object->setRelCoor(this->currentKeyFrame->position +
-                          (this->nextKeyFrame->position - this->currentKeyFrame->position) * 
-                          (timePassed/this->currentKeyFrame->duration));
+  Vector v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * (timePassed/this->currentKeyFrame->duration);
+  this->object->shiftCoor(v - this->currentKeyFrame->lastPosition);
+  this->currentKeyFrame->lastPosition = v;
 }
 

orxonox/trunk/src/util/animation/animation3d.h

@@ -18 +18 @@
   float duration;                   //!< The duration of this KeyFrame
   Vector position;                  //!< The position of this KeyFrame
+  Vector lastPosition;
   Quaternion direction;             //!< The direction of this KeyFrame
   ANIM_FUNCTION animFuncMov;        //!< with whitch function to iterate movement to the next KeyFrame3D