Changeset 3993 in orxonox.OLD for orxonox/trunk/src/util/animation/animation3d.cc

Timestamp:

Apr 27, 2005, 12:12:28 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: patch to use relative coordinates again, some smaller changes in the preLoading/loading mechanisms

File:

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

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

@@ -178 +178 @@
     case ANIM_LINEAR:
       this->animFuncMov = &Animation3D::mLinear;
-      //this->object->setRelCoor(this->currentKeyFrame->position);
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_SINE:
       this->animFuncMov = &Animation3D::mSine;
-      //this->object->setRelCoor(this->currentKeyFrame->position);
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_COSINE:
       this->animFuncMov = &Animation3D::mCosine;
-      //this->object->setRelCoor(this->currentKeyFrame->position);
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_EXP:
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->animFuncMov = &Animation3D::mExp;
       break;
     case ANIM_NEG_EXP:
       this->animFuncMov = &Animation3D::mNegExp;
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->expFactorMov = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
       this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_QUADRATIC:
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->animFuncMov = &Animation3D::mQuadratic;
       break;
     case ANIM_RANDOM:
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->animFuncMov = &Animation3D::mRandom;
       break;
@@ -353 +357 @@
     case ANIM_CONSTANT:
       this->animFuncRot = &Animation3D::rConstant;
-      printf("a;sdlfkja;lskdjf;alskjdf;lasjdf;lasjdf;lasjdf;lajsdf\n");
       break;
     case ANIM_LINEAR: