Changeset 3794 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Apr 13, 2005, 3:44:38 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: definition of animation

Location:

orxonox/trunk/src/story_entities

Files:

• world.cc (modified) (3 diffs)
• world.h (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -38 +38 @@
 #include "garbage_collector.h"
 #include "simple_animation.h"
+#include "animation.h"
 
 #include "command_node.h"
@@ -368 +369 @@
             testText->setBindNode(tn);
 
-            /*      
-                   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);
-                   tmpAnim->setInfinity(ANIM_INF_CONSTANT, ANIM_INF_REWIND);
-            */
+            testAnim = new tAnim<Text>(testText, &Text::setBlending);
+            testAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
+            testAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
+            testAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
+            testAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
+            testAnim->setInfinity(ANIM_INF_REWIND);
+
             break;
           }
@@ -939 +939 @@
       this->garbageCollector->tick(seconds);
       this->simpleAnimation->tick(seconds);
+      
+      //      testAnim->tick(seconds);
 
     }

orxonox/trunk/src/story_entities/world.h

@@ -24 +24 @@
 class GarbageCollector;
 class SimpleAnimation;
-
+class Anim;
 class Text;
 
@@ -99 +99 @@
   GLMenuImageScreen* glmis;           //!< The Level-Loader Display
 
+  Anim* testAnim;
   Text* testText;                     //!< A text to Test the TextEngine;