Changeset 3976 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 26, 2005, 2:05:36 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented cosine rotation function. still looks wicked

Location:

orxonox/trunk/src

Files:

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

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->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_COSINE); 
+            animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_COSINE); 
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_COSINE); 
 
             //animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_LINEAR); 

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

@@ -394 +394 @@
 void Animation3D::rCosine(float timePassed) const
 {
+  float scale = cos(M_PI * timePassed / this->currentKeyFrame->duration);
+  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction, 
+                                     this->currentKeyFrame->direction, 
+                                     scale) );
 }