Changeset 5062 in orxonox.OLD for orxonox/trunk/src/util/animation

Timestamp:

Aug 17, 2005, 1:02:01 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: animation3D-update, so now one should be able to let the setPos/setDir away, but it does not really work

Location:

orxonox/trunk/src/util/animation

Files:

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

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

@@ -33 +33 @@
 typedef enum ANIM_FUNCTION
 {
-  ANIM_CONSTANT,
-  ANIM_LINEAR,
-  ANIM_SINE,
-  ANIM_COSINE,
-  ANIM_EXP,
-  ANIM_NEG_EXP,
-  ANIM_QUADRATIC,
-  ANIM_RANDOM,
-  ANIM_NULL
+  ANIM_NULL         = 0,
+  ANIM_CONSTANT     = 1,
+  ANIM_LINEAR       = 2,
+  ANIM_SINE         = 3,
+  ANIM_COSINE       = 4,
+  ANIM_EXP          = 5,
+  ANIM_NEG_EXP      = 6,
+  ANIM_QUADRATIC    = 7,
+  ANIM_RANDOM       = 8,
 };
 

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

@@ -44 +44 @@
   this->nextKeyFrame = tmpKeyFrame;
 
-  this->animFuncMov = &Animation3D::mLinear;
-  this->animFuncRot = &Animation3D::rLinear;
+  this->animFuncMov = NULL;//&Animation3D::mLinear;
+  this->animFuncRot = NULL;//&Animation3D::rLinear;
 
 }
@@ -95 +95 @@
     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;
+//  if (animFuncMov == ANIM_NULL)
+//    animFuncMov = ANIM_DEFAULT_FUNCTION;
+//  if (animFuncRot == ANIM_NULL)
+//    animFuncRot = animFuncMov;
 
   KeyFrame3D* tmpKeyFrame;
@@ -126 +126 @@
   this->keyFrameCount++;
 }
-
-
 
 /**
@@ -158 +156 @@
         }
       /* now animate it */
-      (this->*animFuncMov)(this->localTime);
-      (this->*animFuncRot)(this->localTime);
+      if (likely(this->animFuncMov != NULL))
+        (this->*animFuncMov)(this->localTime);
+      if (likely(this->animFuncRot != NULL))
+        (this->*animFuncRot)(this->localTime);
     }
 }
@@ -211 +211 @@
       break;
     default:
+      this->animFuncMov = NULL;
       break;
     }
@@ -353 +354 @@
   switch (animFuncRot)
     {
-    default:
     case ANIM_CONSTANT:
       this->animFuncRot = &Animation3D::rConstant;
@@ -380 +380 @@
       break;
 
+    default:
+      this->animFuncRot = NULL;
     }
 }
@@ -448 +450 @@
 void Animation3D::rExp(float timePassed) const
 {
-  PRINTF(0)("exp rotation function not implemented\n");
+  PRINTF(2)("exp rotation function not implemented\n");
 }