Changeset 3986 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

Apr 26, 2005, 12:38:20 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed two major bugs in the animation3d framework (addKeyFrame, tick issues), added shoot animation again. one of both animation is still placed at the wrong place, since the weapons are not symmetrical

File:

• orxonox/trunk/src/util/animation/animation3d.cc (modified) (9 diffs)

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

@@ -46 +46 @@
   this->animFuncMov = &Animation3D::mLinear;
   this->animFuncRot = &Animation3D::rLinear;
+
+  this->bRunning = false;
 }
 
@@ -172 +174 @@
   switch (animFuncMov)
     {
-    default:
     case ANIM_CONSTANT:
       this->animFuncMov = &Animation3D::mConstant;
@@ -197 +198 @@
       this->animFuncMov = &Animation3D::mNegExp;
       this->expFactorMov = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
+      this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_QUADRATIC:
@@ -204 +206 @@
       this->animFuncMov = &Animation3D::mRandom;
       break;
+    default:
+      break;
     }
 }
@@ -215 +219 @@
 void Animation3D::mConstant(float timePassed) const
 {
-  this->object->setRelCoor(this->currentKeyFrame->position);
+  //this->object->setRelCoor(this->currentKeyFrame->position);
 
   /*
@@ -296 +300 @@
 void Animation3D::mNegExp(float timePassed) const
 {
+  Vector v;
+  v = (this->nextKeyFrame->position - this->currentKeyFrame->position) * (1.0 - expf(- timePassed * expFactorMov));
+  this->object->shiftCoor(v - this->currentKeyFrame->lastPosition);
+  this->currentKeyFrame->lastPosition = v;
+
+  /*
   this->object->setRelCoor( this->currentKeyFrame->position +
                             (this->nextKeyFrame->position - this->currentKeyFrame->position) * 
                             (1.0 - expf(- timePassed * expFactorMov)) );
+  */
 }
 
@@ -320 +331 @@
 void Animation3D::mRandom(float timePassed) const
 {
+  /*
   this->object->setRelCoor(this->currentKeyFrame->position + 
                            (this->nextKeyFrame->position - this->currentKeyFrame->position) * (float)rand()/(float)RAND_MAX);
   this->object->setRelDir(this->currentKeyFrame->direction +
                           (this->nextKeyFrame->direction - this->currentKeyFrame->direction)* (float)rand()/(float)RAND_MAX);
+  */
 }
 
@@ -338 +351 @@
   switch (animFuncRot)
     {
-   default:
+    default:
     case ANIM_CONSTANT:
       this->animFuncRot = &Animation3D::rConstant;
+      printf("a;sdlfkja;lskdjf;alskjdf;lasjdf;lasjdf;lasjdf;lajsdf\n");
       break;
     case ANIM_LINEAR:
@@ -364 +378 @@
       this->animFuncRot = &Animation3D::rRandom;
       break;
+
     }
 }