Changeset 4122 in orxonox.OLD for orxonox/branches/heightMap/src/util/animation/animation.cc

Timestamp:

May 9, 2005, 11:29:19 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:

orxonox/branches/heightMap

Files:

• . (modified) (1 prop)
• src/util/animation/animation.cc (modified) (5 diffs)

orxonox/branches/heightMap

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/heightMap/src/util/animation/animation.cc

@@ -34 +34 @@
 
   // setting default values
+  this->keyFramesToPlay = -1;
   this->localTime = 0.0;
-  this->bRunning = true;
+  this->bRunning = false;
 
   AnimationPlayer::getInstance()->addAnimation(this);
@@ -83 +84 @@
       break;
     case ANIM_INF_REPLAY:
-      this->replay();
+      this->rewind();
+      this->bRunning = true;
       break;
     case ANIM_INF_REWIND:
@@ -99 +101 @@
 void Animation::play()
 {
+  this->keyFramesToPlay = -1;
+  this->bRunning = true;
+}
+
+/**
+   \brief plays the Next n keyframes
+   \param n the Count of keyFrames to play.
+*/
+void Animation::playNextKeyframes(int n)
+{
+  this->keyFramesToPlay = n-1;
   this->bRunning = true;
 }
@@ -107 +120 @@
 void Animation::stop()
 {
+  this->keyFramesToPlay = -1;
   this->rewind();
   this->bRunning = true;
@@ -127 +141 @@
 {
   this->rewind();
-  this->bRunning = true;
+  this->play();
 }

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+