Changeset 3717 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 4, 2005, 9:59:00 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: simple change in animation player

Location:

orxonox/trunk/src

Files:

• simple_animation.cc (modified) (2 diffs)
• simple_animation.h (modified) (2 diffs)

orxonox/trunk/src/simple_animation.cc

@@ -156 +156 @@
 void SimpleAnimation::addKeyFrame(KeyFrame* frame)
 {
-  this->frames->add(frame);
+  if( frame != NULL)
+    this->frames->add(frame);
 }
 
@@ -227 +228 @@
   if(!this->bPause)
     {
-
-
-
+      switch( this->mode)
+        {
+        case LINEAR:
+          
+          break;
+        case EXP:
+
+          break;
+        case NEG_EXP:
+
+          break;
+        case SIN:
+
+          break;
+        case COS:
+
+          break;
+        case QUADRATIC:
+
+          break;
+        default:
+          break;
+        }
     }
 }

orxonox/trunk/src/simple_animation.h

@@ -16 +16 @@
 
 
-typedef enum movementMode{LINEAR=0, EXP, NEG_EXP, SIN, COS};
+typedef enum movementMode{LINEAR=0, EXP, NEG_EXP, SIN, COS, QUADRATIC};
 
 
@@ -63 +63 @@
  private:
   bool bPause;                     //<! is set, when there is a pause
-  tList<KeyFrame>* frames;        //<! where keyframes are stored in
+  tList<KeyFrame>* frames;         //<! where keyframes are stored in
+  KeyFrame* currentFrame;          //<! the frame that is been played now
+  movementMode mode;               //<! this is an enum of the mode, how the speed is distributed
   float localTime;
   PNode* parent;