Changeset 3967 in orxonox.OLD

Timestamp:

Apr 26, 2005, 12:31:54 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: animation3d now ANIM_COSINE works also

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

@@ -471 +471 @@
             c->setRelCoor(Vector(10.0, 2.0, -1.0));
             this->spawn(c);
-            
+
+
             
             Animation3D* animation = new Animation3D(c);
             animation->setInfinity(ANIM_INF_REPLAY);
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_SINE); 
-            animation->addKeyFrame(Vector(1, 1, -1), Quaternion(), 1.0, ANIM_SINE); 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_SINE); 
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_COSINE); 
+            animation->addKeyFrame(Vector(1, 1, -1), Quaternion(), 1.0, ANIM_COSINE); 
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_COSINE); 
+
+
+
 
 

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

@@ -271 +271 @@
 
 
+/**
+   \brief a cosine interpolation between this keyframe and the next one
+   \param timePassed The time passed since this Keyframe began
+
+   \todo implement
+*/
+void Animation3D::cosine(float timePassed) const
+{
+  this->object->setRelCoor( this->nextKeyFrame->position -
+                            (this->nextKeyFrame->position - this->currentKeyFrame->position) *
+                            (1.0 + cos( M_PI * timePassed / this->currentKeyFrame->duration))/2.0);
+
+}
+
+
 /*
-  if (timePassed * 2.0 < this->currentKeyFrame->duration)
-    return this->currentKeyFrame->value + (this->nextKeyFrame->value - this->currentKeyFrame->value) 
-      * sin( M_PI * timePassed / this->currentKeyFrame->duration)/2;
-  else 
-    return this->nextKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
-      * sin( M_PI * (1.0 - timePassed / this->currentKeyFrame->duration))/2;
-
-*/
-
-/**
-   \brief a cosine interpolation between this keyframe and the next one
-   \param timePassed The time passed since this Keyframe began
-
-   \todo implement
-*/
-void Animation3D::cosine(float timePassed) const
-{
-  this->linear(timePassed);
-}
+ return ((this->nextKeyFrame->value + this->currentKeyFrame->value) +
+    (this->currentKeyFrame->value - this->nextKeyFrame->value) *
+    cos( M_PI * timePassed / this->currentKeyFrame->duration))/2;
+*/
 
 /**