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

Timestamp:

Apr 17, 2005, 1:21:59 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: animation: more adaptions to the new Framework

Location:

orxonox/trunk/src/story_entities

Files:

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

orxonox/trunk/src/story_entities/world.cc

@@ -38 +38 @@
 #include "track_manager.h"
 #include "garbage_collector.h"
-#include "simple_animation.h"
 #include "animation_player.h"
 
@@ -161 +160 @@
   TextEngine::getInstance()->flush();
 
-  delete this->simpleAnimation;
-
   AnimationPlayer::getInstance()->debug();
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
@@ -203 +200 @@
   wi->init(this);
   this->garbageCollector = GarbageCollector::getInstance();
-  this->simpleAnimation = SimpleAnimation::getInstance();
 }
 
@@ -935 +931 @@
       this->localCamera->tick(this->dt);
       this->garbageCollector->tick(seconds);
-      this->simpleAnimation->tick(seconds);
+
       AnimationPlayer::getInstance()->tick(seconds);
     }

orxonox/trunk/src/story_entities/world.h

@@ -24 +24 @@
 class Terrain;
 class GarbageCollector;
-class SimpleAnimation;
 class Text;
 
@@ -116 +115 @@
   GarbageCollector* garbageCollector; //!< reference to the garbage  collector
 
-  SimpleAnimation* simpleAnimation;   //!< reference to the SimpleAnimation object
- 
   /* function for main-loop */
   void mainLoop ();