Changeset 3795 in orxonox.OLD for orxonox/trunk/src/animation.h

Timestamp:

Apr 13, 2005, 4:32:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved some functions around in the Animation-classes

File:

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

orxonox/trunk/src/animation.h

@@ -27 +27 @@
 #define _ANIMATION_H
 
-
+#include "list.h"
 // FORWARD DEFINITION
-template<class T> class tList;
 
 typedef enum ANIM_FUNCTION {ANIM_CONSTANT,
@@ -55 +54 @@
   void setInfinity(ANIM_INFINITY postInfinity = ANIM_INF_CONSTANT);
 
-  void addKeyFrame(float value, float duration, ANIM_FUNCTION animFunc = ANIM_LINEAR);
-  void setAnimFunc(ANIM_FUNCTION animFunc);
-
   void play(); // equals resume();
   void stop();
   void pause();
   void replay();
+  //  virtual void rewind();
 
   virtual void tick(float time) = 0;
 
+  /* implement in subclasses:
+   * 
+   * De-/Constructor
+   * Animation Functions
+   * virtual tick
+   * List of keyFrames
+   * currentKeyFrame/nextKeyFrame
+   * virtual rewind, to go to the first Keyframe. (other functions will call this one)
+   */
  protected:
   Anim(void);
 
-  static tList<Anim>* animatorList;
+  // variables
+
+  float localTime;
+  ANIM_INFINITY postInfinity;
+
+  bool bHasKeys;
+  bool bRunning;
+};
+
+
+//! A Class to handle some animation for single floated values.
+template<class T> class tAnim : public Anim
+{
+ public:
+  tAnim(T* object = NULL, void (T::*funcToAnim)(float) = NULL);
+  virtual ~tAnim();
+
+  void setFuncToAnim(T* object, void (T::*funcToAnim)(float));
+  void addKeyFrame(float value, float duration, ANIM_FUNCTION animFunc = ANIM_LINEAR);
+
 
   // animation functions
+  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;
-
-
-  // variables
   //  ANIM_FUNCTION animFunc;
-  float (Anim::*animFunc)(float) const;
-
-  ANIM_INFINITY postInfinity;
-
-  bool bHasKeys;
-  bool bRunning;
-
-  float localTime;
+  float (tAnim<T>::*animFunc)(float) const;
   AnimKeyFrame* currentKeyFrame;
   AnimKeyFrame* nextKeyFrame;
   tList<AnimKeyFrame>* keyFrameList;
-};
-
-
-//! A Class to handle some animation for single floated values.
-template<class T> class tAnim : public Anim
-{
- public:
-  tAnim(T* object = NULL, void (T::*funcToAnim)(float) = NULL);
-  virtual ~tAnim();
-
-  void setFuncToAnim(T* object, void (T::*funcToAnim)(float));
+
+
+
 
   virtual void tick(float time);
@@ -118 +127 @@
 tAnim<T>::tAnim (T* object, void (T::*funcToAnim)(float)) 
 {
+  // create a new List
+  this->keyFrameList = new tList<AnimKeyFrame>();
+  AnimKeyFrame* tmpKeyFrame = new AnimKeyFrame;
+  tmpKeyFrame->value = 0.0;
+  tmpKeyFrame->duration = 1.0;
+  keyFrameList->add(tmpKeyFrame);
+
+  this->currentKeyFrame = tmpKeyFrame;
+  this->nextKeyFrame = tmpKeyFrame;
+
+  this->animFunc = &tAnim<T>::linear;
+
   this->setFuncToAnim(object, funcToAnim);
 }
@@ -129 +150 @@
 tAnim<T>::~tAnim () 
 {
-  // delete what has to be deleted here
+  // delete all the KeyFrames
+  tIterator<AnimKeyFrame>* itKF = keyFrameList->getIterator();
+  AnimKeyFrame*  enumKF = itKF->nextElement();
+  while (enumKF)
+    {
+      delete enumKF;
+      enumKF = itKF->nextElement();
+    }
+  delete itKF;
+  delete this->keyFrameList;
+
 }
 
@@ -138 +169 @@
   this->object = object;
   this->funcToAnim = funcToAnim;
+}
+
+template<class T>
+void tAnim<T>::addKeyFrame(float value, float duration, ANIM_FUNCTION animFunc)
+{
+  // some small check
+  if (duration <= 0.0)
+    duration = 1.0;
+  
+
+  AnimKeyFrame* tmpKeyFrame;
+    
+  if (bHasKeys)
+    {
+      tmpKeyFrame = new AnimKeyFrame;
+      if (this->currentKeyFrame == this->nextKeyFrame)
+        this->nextKeyFrame = tmpKeyFrame;
+      this->keyFrameList->add(tmpKeyFrame);
+
+    }
+  else
+    {
+      tmpKeyFrame = this->keyFrameList->firstElement();
+      bHasKeys = true;
+    }
+  tmpKeyFrame->value = value;
+  tmpKeyFrame->duration = duration;
+  tmpKeyFrame->animFunc = animFunc;
+  
 }
 
@@ -170 +230 @@
 }
 
+
+template<class T>
+void tAnim<T>::setAnimFunc(ANIM_FUNCTION animFunc)
+{
+  switch (animFunc)
+    {
+    default:
+    case ANIM_CONSTANT:
+      this->animFunc = &tAnim<T>::constant;
+      break;
+    case ANIM_LINEAR:
+      this->animFunc = &tAnim<T>::linear;
+      break;
+    case ANIM_RANDOM:
+      this->animFunc = &tAnim<T>::random;
+      break;
+    case ANIM_SINE:
+      this->animFunc = &tAnim<T>::sine;
+      break;
+    }
+}
+
+
+// animation functions
+template<class T>
+float tAnim<T>::random(float timePassed) const
+{
+  return (float)rand()/(float)RAND_MAX;
+}
+
+template<class T>
+float tAnim<T>::constant(float timePassed) const
+{
+  return this->currentKeyFrame->value;
+}
+
+template<class T>
+float tAnim<T>::linear(float timePassed) const 
+{
+  return this->nextKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value) 
+    * (timePassed / this->currentKeyFrame->duration);
+  //  PRINTF(0)("value is %f, %p %p\n", val, this->currentKeyFrame, this->nextKeyFrame);
+  //  return val;
+}
+
+template<class T>
+float tAnim<T>::sine(float timePassed) const
+{
+  
+}
+
 #endif /* _ANIMATION_H */