Changeset 3977 in orxonox.OLD

Timestamp:

Apr 26, 2005, 2:11:29 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented neg_exp rotation also now

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• util/animation/animation3d.cc (modified) (7 diffs)
• util/animation/animation3d.h (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -477 +477 @@
             animation->setInfinity(ANIM_INF_REPLAY);
 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_COSINE); 
-            animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_COSINE); 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_COSINE); 
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_NEG_EXP); 
+            animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_NEG_EXP); 
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_NEG_EXP); 
 
             //animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_LINEAR); 

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

@@ -174 +174 @@
     case ANIM_NEG_EXP:
       this->animFuncMov = &Animation3D::mNegExp;
-      this->expFactor = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
+      this->expFactorMov = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
       break;
     case ANIM_QUADRATIC:
@@ -252 +252 @@
 
 
-/*
- return ((this->nextKeyFrame->value + this->currentKeyFrame->value) +
-    (this->currentKeyFrame->value - this->nextKeyFrame->value) *
-    cos( M_PI * timePassed / this->currentKeyFrame->duration))/2;
-*/
 
 /**
@@ -276 +271 @@
   this->object->setRelCoor( this->currentKeyFrame->position +
                             (this->nextKeyFrame->position - this->currentKeyFrame->position) * 
-                            (1.0 - expf(- timePassed * expFactor)) );
+                            (1.0 - expf(- timePassed * expFactorMov)) );
 }
 
@@ -334 +329 @@
     case ANIM_NEG_EXP:
       this->animFuncRot = &Animation3D::rNegExp;
+      this->expFactorRot = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
       break;
     case ANIM_QUADRATIC:
@@ -351 +347 @@
 void Animation3D::rConstant(float timePassed) const
 {
+  this->object->setRelDir(this->currentKeyFrame->direction);
 }
 
@@ -401 +398 @@
 
 
-/*
- return ((this->nextKeyFrame->value + this->currentKeyFrame->value) +
-    (this->currentKeyFrame->value - this->nextKeyFrame->value) *
-    cos( M_PI * timePassed / this->currentKeyFrame->duration))/2;
-*/
 
 /**
@@ -422 +414 @@
 void Animation3D::rNegExp(float timePassed) const
 {
+  float scale = (1.0 - expf(- timePassed * expFactorRot));
+  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction, 
+                                     this->currentKeyFrame->direction, 
+                                     scale) );
 }
 

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

@@ -73 +73 @@
   Vector tmpVect;        //!< what for??
   float deltaT;          //!< ??
-  float expFactor;
+  float expFactorMov;
+  float expFactorRot;
 };