Changeset 3846 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 17, 2005, 1:32:39 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: now the Text is real sexy, smashing in and smoothly fading out

Location:

orxonox/trunk/src

Files:

• animation.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• track_manager.cc (modified) (2 diffs)

orxonox/trunk/src/animation.h

@@ -239 +239 @@
       if (localTime >= this->currentKeyFrame->duration)
         {
+          // switching to the next Key-Frame
+          this->currentKeyFrame = this->nextKeyFrame;
           this->localTime = 0;
+          // checking, if we should still Play the animation
           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->currentKeyFrame = this->nextKeyFrame;
+            {
+              switch (this->postInfinity)
+                {
+                case ANIM_INF_CONSTANT:
+                  this->bRunning = false;
+                  break;
+                case ANIM_INF_REWIND:
+                  break;
+                }
+            }
           this->nextKeyFrame = this->keyFrameList->nextElement(this->nextKeyFrame);
           printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);

orxonox/trunk/src/story_entities/world.cc

@@ -373 +373 @@
             this->glmis->step();
 
-            this->testText = TextEngine::getInstance()->createText("fonts/earth.ttf", 30, TEXT_DYNAMIC, 0, 255, 0);
-            testText->setText("We've got Hostiles!");
-            testText->setBlending(1.0);
-            testText->setBindNode(tn);
-
-            //aTest* test = new aTest();
-            //tAnim<aTest>* testAnim = new tAnim<aTest>(test, &aTest::littleDebug);
-            tAnim<Text>* testAnim = new tAnim<Text>(testText, &Text::setBlending);
-            
-            testAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
-            testAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
-            testAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
-            
-            testAnim->addKeyFrame(0.0, 1.0, ANIM_COSINE);
-            testAnim->addKeyFrame(1.0, 1.0, ANIM_COSINE);         
-            
-            testAnim->addKeyFrame(0.0, 1.0, ANIM_SINE);
-            testAnim->addKeyFrame(1.0, 1.0, ANIM_SINE);
-                    testAnim->addKeyFrame(0.0, 1.0, ANIM_NEG_EXP);
-            testAnim->addKeyFrame(1.0, 1.0, ANIM_NEG_EXP);
-            
-            testAnim->setInfinity(ANIM_INF_REWIND);
             break;
           }

orxonox/trunk/src/track_manager.cc

@@ -394 +394 @@
   // initializing the Animation for the Text.
   this->textAnimation = new tAnim<Text>(this->trackText, &Text::setBlending);
-  this->textAnimation->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
-  this->textAnimation->addKeyFrame(0.0, 1.0);
+  this->textAnimation->addKeyFrame(1.0, 3.0, ANIM_LINEAR);
+  this->textAnimation->addKeyFrame(0.0, .001);
   this->textAnimation->setInfinity(ANIM_INF_CONSTANT);
 }
@@ -941 +941 @@
         {
           this->trackText->setText(this->currentTrackElem->getName());
-          this->textAnimation->play();
+          this->textAnimation->replay();
         }
     }