Changeset 2801 for code/branches/gui/src/orxonox/gamestates/GSStandalone.cc

Timestamp:

Mar 19, 2009, 10:58:43 AM (16 years ago)

Author:

rgrieder

Message:

Move graphic related content of GSGraphics to GraphicsManager which originally was GraphisEngine (but since we don't have an engine of our own, I renamed it).
Reduced OgreWindowEventUtilities.h dependency from GraphisManager.h (includes windows.h).

File:

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

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

@@ -35 +35 @@
 #include "core/ConsoleCommand.h"
 #include "gui/GUIManager.h"
+#include "GraphicsManager.h"
 
 namespace orxonox
@@ -60 +61 @@
         Core::setIsStandalone(true);
 
-        GSLevel::enter(this->getParent()->getViewport());
+        GSLevel::enter();
 
-        guiManager_ = getParent()->getGUIManager();
+        guiManager_ = GUIManager::getInstancePtr();
         // not sure if necessary
         // guiManager_->loadScene("IngameMenu");
@@ -78 +79 @@
         if (guiShowing_s)
         {
-            guiManager_->showGUI("IngameMenu", this->getParent()->getViewport()->getCamera()->getSceneManager());
+            Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
+            guiManager_->showGUI("IngameMenu", viewport->getCamera()->getSceneManager());
         }
         else