Changeset 3825 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 14, 2005, 1:29:39 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: some more animation functions

File:

• orxonox/trunk/src/animation.h (modified) (5 diffs)

orxonox/trunk/src/animation.h

@@ -33 +33 @@
                             ANIM_LINEAR,
                             ANIM_SINE,
+                            ANIM_COSINE,
+                            ANIM_EXP,
+                            ANIM_NEG_EXP,
+                            ANIM_QUADRATIC,
                             ANIM_RANDOM};
 
@@ -40 +44 @@
                             ANIM_INF_REWIND};//, ANIM_DELETE}
 
-struct AnimKeyFrame
+typedef struct AnimKeyFrame
 {
   float duration;
@@ -103 +107 @@
   void setAnimFunc(ANIM_FUNCTION animFunc);
 
-  float random(float timePassed) const;
   float constant(float timePassed) const;
   float linear(float timePassed) const;
   float sine(float timePassed) const;
+  float cosine(float timePassed) const;
+  float exp(float timePassed) const;
+  float negExp(float timePassed) const;
+  float quadratic(float timePassed) const;
+  float random(float timePassed) const;
   //  ANIM_FUNCTION animFunc;
   float (tAnim<T>::*animFunc)(float) const;
@@ -254 +262 @@
       this->animFunc = &tAnim<T>::linear;
       break;
+    case ANIM_SINE:
+      this->animFunc = &tAnim<T>::sine;
+      break;
+    case ANIM_COSINE:
+      this->animFunc = &tAnim<T>::cosine;
+      break;
+    case ANIM_EXP:
+      this->animFunc = &tAnim<T>::exp;
+      break;
+    case ANIM_NEG_EXP:
+      this->animFunc = &tAnim<T>::negExp;
+      break;
+    case ANIM_SINE:
+      this->animFunc = &tAnim<T>::quadratic;
+      break;
     case ANIM_RANDOM:
       this->animFunc = &tAnim<T>::random;
-      break;
-    case ANIM_SINE:
-      this->animFunc = &tAnim<T>::sine;
       break;
     }
@@ -289 +309 @@
 float tAnim<T>::sine(float timePassed) const
 {
-  
-}
+  return this->currentkeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
+    * sin(timePassed / this->currentKeyFrame->duration * M_PI);
+}
+
+template<class T>
+float tAnim<T>::cosine(float timePassed) const
+{
+  return this->currentkeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value)
+    * cos(timePassed / this->currentKeyFrame->duration * M_PI);
+}
+
+template<class T>
+float tAnim<T>::exp(float timePassed) const
+{
+
+}
+
+template<class T>
+float tAnim<T>::negExp(float timePassed) const
+{
+
+}
+
+template<class T>
+float tAnim<T>::quadratic(float timePassed) const
+{
+
+}
+
 
 #endif /* _ANIMATION_H */