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

Timestamp:

Apr 13, 2005, 11:08:43 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: animation-player added

Location:

orxonox/trunk/src/story_entities

Files:

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

orxonox/trunk/src/story_entities/world.cc

@@ -39 +39 @@
 #include "garbage_collector.h"
 #include "simple_animation.h"
-#include "animation.h"
+#include "animation_player.h"
 
 #include "command_node.h"
@@ -162 +162 @@
 
   delete this->simpleAnimation;
+  delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
   //delete garbagecollecor
   //delete animator
@@ -184 +185 @@
   this->debugWorldNr = worldID;
   this->entities = new tList<WorldEntity>();
+  AnimationPlayer::getInstance(); // initializes the animationPlayer
 }
 
@@ -374 +376 @@
             testText->setBindNode(tn);
 
-            testAnim = new tAnim<Text>(testText, &Text::setBlending);
+            tAnim<Text>* testAnim = new tAnim<Text>(testText, &Text::setBlending);
             testAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
             testAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
@@ -944 +946 @@
       this->garbageCollector->tick(seconds);
       this->simpleAnimation->tick(seconds);
-      
+      AnimationPlayer::getInstance()->tick(seconds);
       //testAnim->tick(seconds);
 
@@ -1055 +1057 @@
   else if( !strcmp( cmd->cmd, "view4")) this->localCamera->setViewMode(VIEW_RIGHT);
   else if( !strcmp( cmd->cmd, "view5")) this->localCamera->setViewMode(VIEW_TOP);
-  if (!strcmp(cmd->cmd, "view0")) testAnim->play();
-  if (!strcmp(cmd->cmd, "view1")) testAnim->stop();
-  if (!strcmp(cmd->cmd, "view2")) testAnim->pause();
-  if (!strcmp(cmd->cmd, "view3")) testAnim->replay();
-  if (!strcmp(cmd->cmd, "view4")) testAnim->rewind();
 
   return false;

orxonox/trunk/src/story_entities/world.h

@@ -25 +25 @@
 class GarbageCollector;
 class SimpleAnimation;
-template<class T> class tAnim;
 class Text;
 
@@ -100 +99 @@
   GLMenuImageScreen* glmis;           //!< The Level-Loader Display
 
-  tAnim<Text>* testAnim;
   Text* testText;                     //!< A text to Test the TextEngine;