Changeset 3726 in orxonox.OLD for orxonox/trunk/src/simple_animation.cc

Timestamp:

Apr 5, 2005, 6:34:33 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: reimplemented, rescaled KeyFrame.

File:

• orxonox/trunk/src/simple_animation.cc (modified) (6 diffs)

orxonox/trunk/src/simple_animation.cc

@@ -23 +23 @@
 
 using namespace std;
-
-/**
-   \brief standard constructor
-   \param the point of the object
-   \param and the orientation of it
-   \param at this time
-*/
-KeyFrame::KeyFrame(Vector* point, Quaternion* orientation, float time)
-{
-  this->setRelCoor(point);
-  this->setRelDir(orientation);
-  this->time = time;
-}
-
-
-/**
-   \brief standard constructor
-   \param the point of the object
-   \param and the orientation of it
-   \param at this time
-   \param function of the velocity of the movement 
-*/
-KeyFrame::KeyFrame(Vector* point, Quaternion* orientation, float time, movementMode mode)
-{
-  this->setRelCoor(point);
-  this->setRelDir(orientation);
-  this->time = time;
-  this->mode = mode;
-}
-
-
-/**
-   \brief standard deconstructor
-*/
-KeyFrame::~KeyFrame()
-{
-}
-
-
-/**
-   \brief sets the important properties of a Keyframe
-   \param the point of the object
-   \param and the orientation of it
-   \param at this time
-*/
-void KeyFrame::set(Vector* point, Quaternion* orientation, float time)
-{
-  this->setRelCoor(point);
-  this->setRelDir(orientation);
-  this->time = time;
-}
-
-
-/**
-   \brief sets the important properties of a Keyframe
-   \param the point of the object
-   \param and the orientation of it
-   \param at this time
-   \param function of the velocity of the movement 
-*/
-void KeyFrame::set(Vector* point, Quaternion* orientation, float time, movementMode mode)
-{
-  this->setRelCoor(point);
-  this->setRelDir(orientation);
-  this->time = time;
-  this->mode = mode;
-}
 
 
@@ -137 +70 @@
 void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* orientation, float time)
 {
-  KeyFrame* frame = new KeyFrame(point, orientation, time);
+  KeyFrame* frame = new KeyFrame;
+  frame->position = point;
+  frame->orientation = orientation;
+  frame->time = time;
+  frame->mode = DEFAULT_ANIMATION_MODE;
   this->frames->add(frame);
 }
@@ -151 +88 @@
 void SimpleAnimation::addKeyFrame(Vector* point, Quaternion* orientation, float time, movementMode mode)
 {
-  KeyFrame* frame = new KeyFrame(point, orientation, time, mode);
+  KeyFrame* frame = new KeyFrame;
+  frame->position = point;
+  frame->orientation = orientation;
+  frame->time = time;
+  frame->mode = mode;
   this->frames->add(frame);
 }
@@ -267 +208 @@
     case LINEAR:
 
-      *this->tmpVect = this->currentFrame->getAbsCoor() - this->lastFrame->getAbsCoor();
+      *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
       *this->tmpVect = *this->tmpVect * this->localTime / this->currentFrame->time;
       //this->setAbsCoordinate(this->tmpVect);
@@ -275 +216 @@
       break;
     case NEG_EXP:
-      *this->tmpVect = this->currentFrame->getAbsCoor() - this->lastFrame->getAbsCoor();
+      *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
       *this->tmpVect = *this->tmpVect * (1 - exp(- this->localTime / this->currentFrame->time));     
       break;
     case SIN:
-      *this->tmpVect = this->currentFrame->getAbsCoor() - this->lastFrame->getAbsCoor();
+      *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
       *this->tmpVect = *this->tmpVect * (1 - cos(- this->localTime / this->currentFrame->time));     
       break;
@@ -286 +227 @@
       break;
     case QUADRATIC:
-      *this->tmpVect = this->currentFrame->getAbsCoor() - this->lastFrame->getAbsCoor();      
+      *this->tmpVect = *this->currentFrame->position - *this->lastFrame->position;
       *this->tmpVect = *this->tmpVect * 1/3 * ldexpf(this->localTime, 3);
       break;