Changeset 3982 in orxonox.OLD

Timestamp:

Apr 26, 2005, 3:17:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now there is a posibility to play only parts of the animation:
use anim→playNextKeyframes(count_of_keyframes_to_play); to make it work

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• util/animation/animation.cc (modified) (5 diffs)
• util/animation/animation.h (modified) (2 diffs)
• util/animation/animation3d.cc (modified) (1 diff)
• util/animation/t_animation.h (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -479 +479 @@
             animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_SINE); 
             animation->addKeyFrame(Vector(0, 2, 0), Quaternion(M_PI, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_SINE); 
-            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_SINE); 
-
+            animation->addKeyFrame(Vector(0, 0, 0), Quaternion(0, Vector(0,1,0)), 1.0, ANIM_LINEAR, ANIM_SINE);
+            animation->playNextKeyframes(1);
             //animation->addKeyFrame(Vector(0, 0, 0), Quaternion(), 1.0, ANIM_LINEAR); 
 

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

@@ -34 +34 @@
 
   // setting default values
+  this->keyFramesToPlay = -1;
   this->localTime = 0.0;
   this->bRunning = true;
@@ -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();
 }

orxonox/trunk/src/util/animation/animation.h

@@ -73 +73 @@
 
   void play(); // equals resume();
+  void playNextKeyframes(int n = 1);
   void stop();
   void pause();
@@ -99 +100 @@
   BaseObject* baseObject;         //!< The same as object in the derived classes, but with reference to BaseObject
   unsigned int keyFrameCount;     //!< The Count of KeyFrames.
+  int keyFramesToPlay;            //!< How many more Keyframes to play. if negative it will be ignored if 0 stop.
   bool bHandled;                  //!< If this Animation is handled by the AnimationPlayer.
   bool bRunning;                  //!< If the animation is running

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

@@ -138 +138 @@
       if (localTime >= this->currentKeyFrame->duration)
         {
-          // switching to the next Key-Frame
-          this->localTime -= this->currentKeyFrame->duration;
-          this->currentKeyFrame = this->nextKeyFrame;
-          // checking, if we should still Play the animation
-          if (this->currentKeyFrame == this->keyFrameList->lastElement())
-            this->handleInfinity();
-          this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
-          this->setAnimFuncMov(this->currentKeyFrame->animFuncMov);
-          this->setAnimFuncRot(this->currentKeyFrame->animFuncRot);
-        }
+          if (likely(this->keyFramesToPlay != 0))
+            {
+              if (unlikely(this->keyFramesToPlay > 0))
+                --this->keyFramesToPlay;
+              // switching to the next Key-Frame
+              this->localTime -= this->currentKeyFrame->duration;
+              this->currentKeyFrame = this->nextKeyFrame;
+              // checking, if we should still Play the animation
+              if (this->currentKeyFrame == this->keyFrameList->lastElement())
+                this->handleInfinity();
+              this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
+              this->setAnimFuncMov(this->currentKeyFrame->animFuncMov);
+              this->setAnimFuncRot(this->currentKeyFrame->animFuncRot);
+            }
+          else
+            this->pause();
+        }      
       /* now animate it */
       (this->*animFuncMov)(this->localTime);

orxonox/trunk/src/util/animation/t_animation.h

@@ -192 +192 @@
       if (localTime >= this->currentKeyFrame->duration)
         {
-          // switching to the next Key-Frame
-          this->localTime -= this->currentKeyFrame->duration;
-
-          this->currentKeyFrame = this->nextKeyFrame;
-          // checking, if we should still Play the animation
-          if (this->currentKeyFrame == this->keyFrameList->lastElement())
-            this->handleInfinity();
-          this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
-
-          printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
-          this->setAnimFunc(this->currentKeyFrame->animFunc);     
+          if (likely(this->keyFramesToPlay != 0))
+            {
+              if (unlikely(this->keyFramesToPlay > 0))
+                --this->keyFramesToPlay;
+              // switching to the next Key-Frame
+              this->localTime -= this->currentKeyFrame->duration;
+              
+              this->currentKeyFrame = this->nextKeyFrame;
+              // checking, if we should still Play the animation
+              if (this->currentKeyFrame == this->keyFrameList->lastElement())
+                this->handleInfinity();
+              this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
+              
+              printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
+              this->setAnimFunc(this->currentKeyFrame->animFunc);         
+            }
+          else
+            this->pause();
         }