Changeset 3786 in orxonox.OLD

Timestamp:

Apr 13, 2005, 2:17:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: amimate: rewind works

Location:

orxonox/branches/textEngine/src

Files:

• animation.cc (modified) (5 diffs)
• animation.h (modified) (3 diffs)
• story_entities/world.cc (modified) (1 diff)

orxonox/branches/textEngine/src/animation.cc

@@ -33 +33 @@
 
   // setting default values
+  this->localTime = 0.0;
   this->animFunc = &Anim::linear;
   this->currentKeyFrame = tmpKeyFrame;
@@ -70 +71 @@
       if (this->currentKeyFrame == this->nextKeyFrame)
         this->nextKeyFrame = tmpKeyFrame;
+      this->keyFrameList->add(tmpKeyFrame);
+
     }
   else
@@ -80 +83 @@
   tmpKeyFrame->animFunc = animFunc;
   
-  this->keyFrameList->add(tmpKeyFrame);
 }
 
@@ -106 +108 @@
       this->animFunc = &Anim::sine;
       break;
-
     }
 }
@@ -112 +113 @@
 
 // animation functions
-float Anim::random(float time) const
+float Anim::random(float timePassed) const
 {
   return (float)rand()/(float)RAND_MAX;
 }
 
-float Anim::constant(float time) const
+float Anim::constant(float timePassed) const
 {
   return this->currentKeyFrame->value;
 }
 
-float Anim::linear(float time) const 
+float Anim::linear(float timePassed) const 
 {
   return this->nextKeyFrame->value - (this->nextKeyFrame->value - this->currentKeyFrame->value) 
-    * (time*100.0 / this->currentKeyFrame->duration);
+    * (timePassed / this->currentKeyFrame->duration);
   //  PRINTF(0)("value is %f, %p %p\n", val, this->currentKeyFrame, this->nextKeyFrame);
   //  return val;
 }
 
-float Anim::sine(float time) const
+float Anim::sine(float timePassed) const
 {
-
+  
 }

orxonox/branches/textEngine/src/animation.h

@@ -66 +66 @@
 
   // animation functions
-  float random(float time) const;
-  float constant(float time) const;
-  float linear(float time) const;
-  float sine(float time) const;
+  float random(float timePassed) const;
+  float constant(float timePassed) const;
+  float linear(float timePassed) const;
+  float sine(float timePassed) const;
 
 
@@ -79 +79 @@
 
   bool bHasKeys;
+  bool bPlay;
 
+  float localTime;
   AnimKeyFrame* currentKeyFrame;
   AnimKeyFrame* nextKeyFrame;
@@ -137 +139 @@
 void Animation<T>::tick(float time)
 {
-  (this->object->*(funcToAnim))((this->*animFunc)(time));
+  this->localTime += time;
+  if (localTime >= this->currentKeyFrame->duration)
+    {
+      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->object->*(funcToAnim))((this->*animFunc)(this->localTime));
 }
 

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

@@ -361 +361 @@
             
             tmpAnim = new Animation<Text>(testText, &Text::setBlending);
+            tmpAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
+            tmpAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
             tmpAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
             tmpAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);