Changeset 3979 in orxonox.OLD

Timestamp:

Apr 26, 2005, 2:24:50 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: nicer implementation, also fool-proof now

Location:

orxonox/trunk/src/util/animation

Files:

• animation.h (modified) (1 diff)
• animation3d.cc (modified) (1 diff)
• animation3d.h (modified) (1 diff)
• t_animation.h (modified) (2 diffs)

orxonox/trunk/src/util/animation/animation.h

@@ -39 +39 @@
                             ANIM_RANDOM,
                             ANIM_NULL};
+#define ANIM_DEFAULT_FUNCTION ANIM_LINEAR      //!< A default function to choose from the above set
 
 //! An enumerator describing what the animation should do after the last keyframe.

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

@@ -91 +91 @@
     duration = 1.0;
   // if the Rotation-Animation-function is set ANIM_NULL, animFuncRot will match animFuncRot
+  if (animFuncMov == ANIM_NULL)
+    animFuncMov = ANIM_DEFAULT_FUNCTION;
   if (animFuncRot == ANIM_NULL)
     animFuncRot = animFuncMov;

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

@@ -35 +35 @@
   virtual void rewind(void);
 
-  void addKeyFrame(Vector position, Quaternion direction, float time, ANIM_FUNCTION animFuncMov = ANIM_LINEAR, ANIM_FUNCTION animFuncRot = ANIM_NULL);
+  void addKeyFrame(Vector position, Quaternion direction, float time, ANIM_FUNCTION animFuncMov = ANIM_DEFAULT_FUNCTION, ANIM_FUNCTION animFuncRot = ANIM_NULL);
   //  void addKeyFrame(KeyFrame3D* frame);
 

orxonox/trunk/src/util/animation/t_animation.h

@@ -43 +43 @@
   void setFuncToAnim(T* object, void (T::*funcToAnim)(float));
 
-  void addKeyFrame(float value, float duration, ANIM_FUNCTION animFunc = ANIM_LINEAR);
+  void addKeyFrame(float value, float duration, ANIM_FUNCTION animFunc = ANIM_DEFAULT_FUNCTION);
 
   virtual void rewind();
@@ -154 +154 @@
   if (duration <= 0.0)
     duration = 1.0;
+  if (animFunc == ANIM_NULL)
+    animFunc = ANIM_DEFAULT_FUNCTION;
 
   KeyFrameF* tmpKeyFrame;