Changeset 1688 for code/branches/gui/src/orxonox/gamestates/GSLevel.cc

Timestamp:

Aug 31, 2008, 5:50:42 PM (16 years ago)

Author:

rgrieder

Message:

Modified the GameState hierarchy so that you can get the parent with the actual type by calling getParent().

File:

• code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)

code/branches/gui/src/orxonox/gamestates/GSLevel.cc

@@ -45 +45 @@
 {
     GSLevel::GSLevel(const std::string& name)
-        : GameState(name)
+        : GameStateTyped<GSGraphics>(name)
         , timeFactor_(1.0f)
         , sceneManager_(0)
@@ -68 +68 @@
 
         // create Ogre SceneManager for the level
-        this->sceneManager_ = GraphicsEngine::getInstance().getOgreRoot()->
-            createSceneManager(Ogre::ST_GENERIC, "LevelSceneManager");
+        this->sceneManager_ = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC, "LevelSceneManager");
         COUT(4) << "Created SceneManager: " << sceneManager_->getName() << std::endl;
+
+        // temporary hack
         GraphicsEngine::getInstance().setLevelSceneManager(this->sceneManager_);
 
@@ -98 +99 @@
         delete this->radar_;
 
-        GraphicsEngine::getInstance().getOgreRoot()->destroySceneManager(this->sceneManager_);
+        Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
 
         inputState_->setHandler(0);