Changeset 3787 in orxonox.OLD for orxonox/branches

Timestamp:

Apr 13, 2005, 2:32:26 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: rewind and constant work

Location:

orxonox/branches/textEngine/src

Files:

• animation.cc (modified) (1 diff)
• animation.h (modified) (3 diffs)
• lib/util/list.h (modified) (2 diffs)
• story_entities/world.cc (modified) (1 diff)

orxonox/branches/textEngine/src/animation.cc

@@ -34 +34 @@
   // setting default values
   this->localTime = 0.0;
+  this->bRunning = true;
   this->animFunc = &Anim::linear;
   this->currentKeyFrame = tmpKeyFrame;

orxonox/branches/textEngine/src/animation.h

@@ -35 +35 @@
                             ANIM_SINE,
                             ANIM_RANDOM};
+
 typedef enum ANIM_INFINITY {ANIM_INF_CONSTANT,
                             ANIM_INF_LINEAR,
@@ -79 +80 @@
 
   bool bHasKeys;
-  bool bPlay;
+  bool bRunning;
 
   float localTime;
@@ -139 +140 @@
 void Animation<T>::tick(float time)
 {
-  this->localTime += time;
-  if (localTime >= this->currentKeyFrame->duration)
+  if (this->bRunning)
     {
-      this->localTime = 0;
-      this->currentKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
-      this->nextKeyFrame = this->keyFrameList->nextElement(this->nextKeyFrame);
-      printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
-
-
+      this->localTime += time;
+      if (localTime >= this->currentKeyFrame->duration)
+        {
+          this->localTime = 0;
+          if (this->currentKeyFrame == this->keyFrameList->lastElement())
+            switch (this->postInfinity)
+              {
+              case ANIM_INF_CONSTANT:
+                this->bRunning = false;
+                break;
+              case ANIM_INF_REWIND:
+                break;
+              }
+          this->currentKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
+          this->nextKeyFrame = this->keyFrameList->nextElement(this->nextKeyFrame);
+          printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
+          
+          
+        }
+      
+      (this->object->*(funcToAnim))((this->*animFunc)(this->localTime));
     }
-
-  (this->object->*(funcToAnim))((this->*animFunc)(this->localTime));
 }
 

orxonox/branches/textEngine/src/lib/util/list.h

@@ -107 +107 @@
   void destroy();
   T* firstElement();
+  T* lastElement();
   bool isEmpty();
   int getSize();
@@ -217 +218 @@
 }
 
+template<class T>
+T* tList<T>::lastElement()
+{
+  return this->last->curr;
+}
+
 
 template<class T>

orxonox/branches/textEngine/src/story_entities/world.cc

@@ -365 +365 @@
             tmpAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
             tmpAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
+            tmpAnim->setInfinity(ANIM_INF_CONSTANT, ANIM_INF_REWIND);
             break;
           }