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

Timestamp:

Aug 13, 2005, 7:19:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more optimizations of the Quaternion Class.
Now the 3D-rotation is much faster through this code:

Vector tmpRot = this→getAbsDir().getSpacialAxis();
glRotatef (this→getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );

instead of the old Matrix-approach. furthermore glRotate is optimized much better in openGL as is clearly stated in the red book

also implemented some other really useless functions for Quaternion

File:

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

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

@@ -401 +401 @@
 void Animation3D::rLinear(float timePassed) const
 {
-  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
-                                     this->currentKeyFrame->direction,
-                                     timePassed/this->currentKeyFrame->duration) );
+  this->object->setRelDir(Quaternion::quatSlerp( this->nextKeyFrame->direction,
+                          this->currentKeyFrame->direction,
+                          timePassed/this->currentKeyFrame->duration) );
 }
 
@@ -420 +420 @@
     scale = 1.0 - sin( M_PI * timePassed / this->currentKeyFrame->duration);
 
-  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
-                                     this->currentKeyFrame->direction,
-                                     scale) );
+  this->object->setRelDir(Quaternion::quatSlerp( this->nextKeyFrame->direction,
+                          this->currentKeyFrame->direction,
+                          scale) );
 }
 
@@ -435 +435 @@
 {
   float scale = cos(M_PI * timePassed / this->currentKeyFrame->duration);
-  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
-                                     this->currentKeyFrame->direction,
-                                     scale) );
+  this->object->setRelDir(Quaternion::quatSlerp( this->nextKeyFrame->direction,
+                          this->currentKeyFrame->direction,
+                          scale) );
 }
 
@@ -458 +458 @@
 {
   float scale = (1.0 - expf(- timePassed * expFactorRot));
-  this->object->setRelDir(quatSlerp( this->nextKeyFrame->direction,
-                                     this->currentKeyFrame->direction,
-                                     scale) );
+  this->object->setRelDir(Quaternion::quatSlerp( this->nextKeyFrame->direction,
+                          this->currentKeyFrame->direction,
+                          scale) );
 }