Changeset 3848 in orxonox.OLD for orxonox/trunk/src/simple_animation.h

Timestamp:

Apr 17, 2005, 2:16:45 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: names of keyframes:
KeyFrame → KeyFrame3D
AnimKeyFrame → KeyFrameF (F for float)

also changed some stuff in the Animation3D-class.

File:

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

orxonox/trunk/src/simple_animation.h

@@ -13 +13 @@
 #include "base_object.h"
 #include "list.h"
-#include "animation_player.h"
+#include "animation.h"
 
 
@@ -30 +30 @@
    This represents one point with direction of the animation
 */
-typedef struct KeyFrame {
+typedef struct KeyFrame3D {
   Vector* position;
   Quaternion* direction;
@@ -42 +42 @@
    This represents an animation for a object
 */
-class Animation3D
+class Animation3D : public Animation
 {
  public:
+  Animation3D(void);
+  virtual ~Animation3D(void);
+    
+  virtual void rewind(void);
+
+  void addKeyFrame(Vector* point, Quaternion* direction, float time, ANIM_FUNCTION animFunc = ANIM_LINEAR);
+  void addKeyFrame(KeyFrame3D* frame);
+
+  virtual void tick(float timePassed);
+
+  // animation functions
+  void setAnimFunc(ANIM_FUNCTION animFunc);
+
+  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;
+  KeyFrame3D* currentKeyFrame;
+  KeyFrame3D* nextKeyFrame;
+  tList<KeyFrame3D>* keyFrameList;
+
+  // private
   WorldEntity* object;
   Vector* lastPosition;
@@ -51 +78 @@
   float localTime;
 
-  tList<KeyFrame>* frames;
-  KeyFrame* currentFrame;
-  KeyFrame* lastFrame;
+  tList<KeyFrame3D>* frames;
+  KeyFrame3D* currentFrame;
+  KeyFrame3D* lastFrame;
 
   bool bRunning;
@@ -75 +102 @@
   void addKeyFrame(Vector* point, Quaternion* direction, float time);
   void addKeyFrame(Vector* point, Quaternion* direction, float time, movementMode mode);
-  void addKeyFrame(KeyFrame* frame);
+  void addKeyFrame(KeyFrame3D* frame);
   void setAnimationMode(animationMode mode);
   void reset();
@@ -94 +121 @@
   bool bDescriptive;               //<! is true, when AnimatorBegin() was executed but no AnimatorEnd() yet: in describtive mode: pass commands
   bool bRunning;                   //<! is set, when the animation is running
-  tList<KeyFrame>* frames;         //<! where keyframes are stored in
+  tList<KeyFrame3D>* frames;         //<! where keyframes are stored in
   tList<Animation3D>* animators;      //<! a list of animation's
-  KeyFrame* currentFrame;          //<! the frame that is been played now
-  KeyFrame* lastFrame;
+  KeyFrame3D* currentFrame;          //<! the frame that is been played now
+  KeyFrame3D* lastFrame;
   Vector* lastPosition;
   movementMode mode;               //<! this is an enum of the mode, how the speed is distributed