Changeset 3984 in orxonox.OLD

Timestamp:

Apr 26, 2005, 3:36:56 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented the sinus function for shifCoor method

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• util/animation/animation3d.cc (modified) (3 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -477 +477 @@
             animation->setInfinity(ANIM_INF_REPLAY);
 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_SINE); 
-            animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_SINE); 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_SINE);
-            animation->playNextKeyframes(1);
-            //animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_LINEAR); 
+
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_SINE, ANIM_LINEAR); 
+            animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_SINE, ANIM_LINEAR); 
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_SINE, ANIM_SINE); 
+
 
 

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

@@ -183 +183 @@
     case ANIM_SINE:
       this->animFuncMov = &Animation3D::mSine;
+      this->object->setRelCoor(this->currentKeyFrame->position);
+      this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_COSINE:
@@ -242 +244 @@
 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) *
@@ -248 +251 @@
     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)
+    v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * sin( M_PI * timePassed /this->currentKeyFrame->duration) / 2.0;
+  else
+    v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * (2.0 + sin( M_PI * (- timePassed /this->currentKeyFrame->duration)) )/ 2.0;
+  
+  this->object->shiftCoor(v - this->currentKeyFrame->lastPosition);
+  this->currentKeyFrame->lastPosition = v;
 }