Changeset 3970 in orxonox.OLD for orxonox

Timestamp:

Apr 26, 2005, 1:03:11 AM (21 years ago)

Author:

patrick

Message:

orxonox/trunk: testet quatSLERP, this function does not seem to work

Location:

orxonox/trunk/src

Files:

• lib/math/vector.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• util/animation/animation3d.cc (modified) (2 diffs)

orxonox/trunk/src/lib/math/vector.cc

@@ -435 +435 @@
 /**
    \brief performs a smooth move.
-   \param from from where
-   \param to to where
-   \param t the time this transformation should take
+   \param from  where
+   \param to where
+   \param t the time this transformation should take value [0..1]
 
    \returns the Result of the smooth move

orxonox/trunk/src/story_entities/world.cc

@@ -476 +476 @@
             Animation3D* animation = new Animation3D(c);
             animation->setInfinity(ANIM_INF_REPLAY);
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_COSINE); 
-            animation->addKeyFrame(Vector(1, 1, -1), Quaternion(), 1.0, ANIM_COSINE); 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_COSINE); 
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(Vector(0,0,1), Vector(0,0,1)), 1.0, ANIM_LINEAR); 
+            animation->addKeyFrame(Vector(0, 2, 0), Quaternion(Vector(0,0,1), Vector(1,0,0)), 1.0, ANIM_LINEAR); 
+            //animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_LINEAR); 
 
 

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

@@ -134 +134 @@
       /* now animate it */
       (this->*animFunc)(this->localTime);
- 
     }
 }
@@ -203 +202 @@
                           (this->nextKeyFrame->position - this->currentKeyFrame->position) * 
                           (timePassed/this->currentKeyFrame->duration));
+
+  this->object->setRelDir( this->nextKeyFrame->direction.quatSlerp( this->nextKeyFrame->direction, 
+                                                                    this->currentKeyFrame->direction, timePassed / 
+                                                                    this->currentKeyFrame->duration) );
+
 }