Changeset 2896 for code/trunk/src/orxonox/gamestates/GSStandalone.cc

Timestamp:

Apr 6, 2009, 1:59:00 AM (15 years ago)

Author:

landauf

Message:

Merged gui branch back to trunk.

I did 2 small changes in IngameManager.cc on line 777 and 888 (yes, really), because const_reverse_iterator strangely doesn't work on MinGW.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSStandalone.cc (modified) (2 diffs)

code/trunk/src/orxonox/gamestates/GSStandalone.cc

@@ -32 +32 @@
 #include <OgreViewport.h>
 #include <OgreCamera.h>
-#include "core/Core.h"
+#include "core/Game.h"
+#include "core/GameMode.h"
 #include "core/ConsoleCommand.h"
 #include "gui/GUIManager.h"
+#include "GraphicsManager.h"
 
 namespace orxonox
 {
-    SetConsoleCommand(GSStandalone, showGUI, true).setAsInputCommand();
+    AddGameState(GSStandalone, "standalone");
 
-    bool GSStandalone::guiShowing_s = false;
-
-    GSStandalone::GSStandalone()
-        : GameState<GSGraphics>("standalone")
+    GSStandalone::GSStandalone(const std::string& name)
+        : GameState(name)
     {
     }
@@ -51 +51 @@
     }
 
-    void GSStandalone::showGUI()
+
+    void GSStandalone::activate()
     {
-        GSStandalone::guiShowing_s = true;
+        GameMode::setIsStandalone(true);
     }
 
-    void GSStandalone::enter()
+    void GSStandalone::deactivate()
     {
-        Core::setIsStandalone(true);
-
-        GSLevel::enter(this->getParent()->getViewport());
-
-        guiManager_ = getParent()->getGUIManager();
-        // not sure if necessary
-        // guiManager_->loadScene("IngameMenu");
+        GameMode::setIsStandalone(false);
     }
 
-    void GSStandalone::leave()
+    void GSStandalone::update(const Clock& time)
     {
-        GSLevel::leave();
-
-        Core::setIsStandalone(false);
-    }
-
-    void GSStandalone::ticked(const Clock& time)
-    {
-        if (guiShowing_s)
-        {
-            guiManager_->showGUI("IngameMenu", this->getParent()->getViewport()->getCamera()->getSceneManager());
-        }
-        else
-        {
-            if (guiManager_)
-                guiManager_->hideGUI();
-        }
-        // tick CEGUI
-        guiManager_->tick(time.getDeltaTime());
-
-        GSLevel::ticked(time);
-        this->tickChild(time);
     }
 }