Changeset 3965 in orxonox.OLD for orxonox

Timestamp:

Apr 26, 2005, 12:08:46 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: animation3d ANIM_SINE is now finaly working also. looks nice

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

@@ -475 +475 @@
             Animation3D* animation = new Animation3D(c);
             animation->setInfinity(ANIM_INF_REPLAY);
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_NEG_EXP); 
-            animation->addKeyFrame(Vector(5, 5, -5), Quaternion(), 1.0, ANIM_NEG_EXP); 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_NEG_EXP); 
+            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); 
 
 

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

@@ -262 +262 @@
 void Animation3D::sine(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);
+}
+
+
+/*
+  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);
 }
 
 /**
-   \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
+   \brief an exponential interpolation between this keyframe and the next one
+   \param timePassed The time passed since this Keyframe began
+*/
+void Animation3D::exp(float timePassed) const
 {
   this->linear(timePassed);
@@ -277 +302 @@
 
 /**
-   \brief an exponential interpolation between this keyframe and the next one
-   \param timePassed The time passed since this Keyframe began
-*/
-void Animation3D::exp(float timePassed) const
-{
-  this->linear(timePassed);
-}
-
-/**
    \brief a negative exponential interpolation between this keyframe and the next one
    \param timePassed The time passed since this Keyframe began
-
-   \todo implement
 */
 void Animation3D::negExp(float timePassed) const
@@ -297 +311 @@
                             (1.0 - expf(- timePassed * expFactor)) );
 }
-
-/*
-  float d = this->currentKeyFrame->value - this->nextKeyFrame->value;
-  float e = d * (1.0 - expf(- timePassed * expFactor));
-  return  this->currentKeyFrame->value - e;
-*/