Changeset 3978 in orxonox.OLD

Timestamp:

Apr 26, 2005, 2:13:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: a Hack that enables setup of animation without giving both animation3D-addkeyframe-function attributes

Location:

orxonox/trunk/src/util/animation

Files:

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

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

@@ -25 +25 @@
    ANIM_NEG_EXP: fast, slow
    ANIM_RANDOM: eratic
-   
+
+   ANIM_NULL: !!DO NOT USE THIS!! only for internal handling
+
    deprecated QUADRATIC
 */
@@ -35 +37 @@
                             ANIM_NEG_EXP,
                             ANIM_QUADRATIC,
-                            ANIM_RANDOM};
+                            ANIM_RANDOM,
+                            ANIM_NULL};
 
 //! An enumerator describing what the animation should do after the last keyframe.

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

@@ -82 +82 @@
    \param direction The direction of the new Keyframe.
    \param duration The duration from the new KeyFrame to the next one
-   \param animFunc The function to animate between this keyFrame and the next one
+   \param animFuncMov The function to animate position between this keyFrame and the next one
+   \param animFuncMov The function to animate rotation between this keyFrame and the next one
 */
 void Animation3D::addKeyFrame(Vector position, Quaternion direction, float duration, ANIM_FUNCTION animFuncMov, ANIM_FUNCTION animFuncRot)
@@ -89 +90 @@
   if (duration <= 0.0)
     duration = 1.0;
+  // if the Rotation-Animation-function is set ANIM_NULL, animFuncRot will match animFuncRot
+  if (animFuncRot == ANIM_NULL)
+    animFuncRot = animFuncMov;
 
   KeyFrame3D* tmpKeyFrame;

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_LINEAR);
+  void addKeyFrame(Vector position, Quaternion direction, float time, ANIM_FUNCTION animFuncMov = ANIM_LINEAR, ANIM_FUNCTION animFuncRot = ANIM_NULL);
   //  void addKeyFrame(KeyFrame3D* frame);