Changeset 3985 in orxonox.OLD for orxonox

Timestamp:

Apr 26, 2005, 3:54:02 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: now implemented the shiftCoor functions correctly

File:

• orxonox/trunk/src/util/animation/animation3d.cc (modified) (3 diffs)

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

@@ -178 +178 @@
     case ANIM_LINEAR:
       this->animFuncMov = &Animation3D::mLinear;
-      this->object->setRelCoor(this->currentKeyFrame->position);
+      //this->object->setRelCoor(this->currentKeyFrame->position);
       this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_SINE:
       this->animFuncMov = &Animation3D::mSine;
-      this->object->setRelCoor(this->currentKeyFrame->position);
+      //this->object->setRelCoor(this->currentKeyFrame->position);
       this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_COSINE:
       this->animFuncMov = &Animation3D::mCosine;
+      //this->object->setRelCoor(this->currentKeyFrame->position);
+      this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_EXP:
@@ -244 +246 @@
 void Animation3D::mSine(float timePassed) const
 {
-  /*
-  if( timePassed  < this->currentKeyFrame->duration/2.0)
-    this->object->setRelCoor( this->currentKeyFrame->position + (this->nextKeyFrame->position - this->currentKeyFrame->position) *
-                              sin( M_PI * timePassed /this->currentKeyFrame->duration) / 2.0);
-  else
-    this->object->setRelCoor( this->nextKeyFrame->position - (this->nextKeyFrame->position - this->currentKeyFrame->position) *
-                              sin( M_PI * (1.0 - timePassed /this->currentKeyFrame->duration) )/2.0);
-  */
   Vector v;
   if( timePassed  < this->currentKeyFrame->duration/2.0)
@@ -271 +265 @@
 void Animation3D::mCosine(float timePassed) const
 {
+  Vector v;
+  v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * (1.0 + cos( M_PI * timePassed / this->currentKeyFrame->duration))/2.0;
+  this->object->shiftCoor(v - this->currentKeyFrame->lastPosition);
+  this->currentKeyFrame->lastPosition = v;
+
+
+  /*
   this->object->setRelCoor( this->nextKeyFrame->position -
                             (this->nextKeyFrame->position - this->currentKeyFrame->position) *
                             (1.0 + cos( M_PI * timePassed / this->currentKeyFrame->duration))/2.0);
+  */
 }