Changeset 3783 in orxonox.OLD for orxonox

Timestamp:

Apr 12, 2005, 4:54:45 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: more functionality to animation-class

File:

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

orxonox/branches/textEngine/src/animation.h

@@ -27 +27 @@
 template<class T> class tList;
 
-enum ANIM_FUNCTION {ANIM_LINEAR };
+enum ANIM_FUNCTION {ANIM_LINEAR, ANIM_SINE };
+enum ANIM_INFINITY {ANIM_INF_CONSTANT, ANIM_INF_LINEAR, ANIM_INF_PINGPONG, ANIM_INF_REWIND};//, ANIM_DELETE}
 
 class Anim
@@ -35 +36 @@
 
   static tList<Anim>* animatorList;
+
+  virtual void tick(float time) = 0;
 };
 
@@ -45 +48 @@
   virtual ~Animation();
 
-  void setFuncToAnim(T* object, void (T::*animFunc)(float));
-  void setAnimFunc();
+  void setFuncToAnim(T* object, void (T::*funcToAnim)(float));
+  void setAnimFunc(ANIM_FUNCTION animFunc);
   void setValue(float value);
 
-  void tick(float time);
+  virtual void tick(float time);
 
  private:
-  void (T::*animFunc)(float);
-  
+  void (T::*funcToAnim)(float);
+  ANIM_FUNCTION animFunc;
   float value;
   T* object;
@@ -83 +86 @@
 
 template<class T>
-void Animation<T>::setFuncToAnim(T* object, void (T::*animFunc)(float))
+void Animation<T>::setFuncToAnim(T* object, void (T::*funcToAnim)(float))
 {
   this->object = object;
-  this->animFunc = animFunc;
+  this->funcToAnim = funcToAnim;
 }
 
@@ -93 +96 @@
 {
   this->value = value;
-  (object->*(animFunc))(value);
+  (object->*(funcToAnim))(value);
 }
 
@@ -99 +102 @@
 void Animation<T>::tick(float time)
 {
-  setValue(value+time/1000);
-  if (value >1)
-    setValue (0);
+  setValue(value - time/1000);
+  if (value < 0)
+    setValue (1.0);
 }