Changeset 2850 for code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc

Timestamp:

Mar 25, 2009, 11:53:04 PM (16 years ago)

Author:

rgrieder

Message:

• Started working on cleaning up the GameState mess
• Cleaned out GUIManager
• Renamed GSGUI to GSMainMenu
• "—state blah" has been changed to —server, —client, —standalone, —dedicated
• —console starts the game in the console (no level loading there yet, but "loadMenu")
• adjusted run scripts

File:

• code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc (moved) (moved from code/branches/gui/src/orxonox/gamestates/GSGUI.cc) (3 diffs)

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

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-#include "GSGUI.h"
+#include "GSMainMenu.h"
 
-#include <OgreViewport.h>
+//#include <OgreViewport.h>
+#include <OgreSceneManager.h>
 #include "core/Clock.h"
 #include "core/ConsoleCommand.h"
@@ -37 +38 @@
 #include "core/input/SimpleInputState.h"
 #include "gui/GUIManager.h"
+#include "objects/Scene.h"
 #include "GraphicsManager.h"
 
 namespace orxonox
 {
-    AddGameState(GSGUI, "mainMenu");
+    AddGameState(GSMainMenu, "mainMenu");
 
-    GSGUI::GSGUI(const std::string& name)
+    GSMainMenu::GSMainMenu(const std::string& name)
         : GameState(name)
+        , inputState_(0)
     {
     }
 
-    GSGUI::~GSGUI()
+    GSMainMenu::~GSMainMenu()
     {
     }
 
-    void GSGUI::activate()
+    void GSMainMenu::activate()
     {
-        guiManager_ = GUIManager::getInstancePtr();
+        inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("mainMenu");
+        inputState_->setHandler(GUIManager::getInstancePtr());
+        inputState_->setJoyStickHandler(&InputManager::EMPTY_HANDLER);
+
+        // create an empty Scene
+        this->scene_ = new Scene(0);
+        // and a Camera
+        this->camera_ = this->scene_->getSceneManager()->createCamera("mainMenu/Camera");
 
         // show main menu
-        //guiManager_->loadScene("MainMenu");
-        guiManager_->showGUI("MainMenu", 0);
-        GraphicsManager::getInstance().getViewport()->setCamera(guiManager_->getCamera());
+        GUIManager::getInstance().showGUI("mainMenu");
+        GUIManager::getInstance().setCamera(this->camera_);
+        GraphicsManager::getInstance().setCamera(this->camera_);
 
         {
-            // time factor console command
-            FunctorMember<GSGUI>* functor = createFunctor(&GSGUI::startGame);
+            FunctorMember<GSMainMenu>* functor = createFunctor(&GSMainMenu::startGame);
             functor->setObject(this);
             this->ccStartGame_ = createConsoleCommand(functor, "startGame");
             CommandExecutor::addConsoleCommandShortcut(this->ccStartGame_);
         }
+        
+        InputManager::getInstance().requestEnterState("mainMenu");
     }
 
-    void GSGUI::deactivate()
+    void GSMainMenu::deactivate()
     {
+        InputManager::getInstance().requestLeaveState("game");
+        InputManager::getInstance().requestDestroyState("game");
+
         if (this->ccStartGame_)
         {
@@ -78 +92 @@
         }
 
-        guiManager_->hideGUI();
+        GUIManager::getInstance().executeCode("hideGUI()");
     }
 
-    void GSGUI::update(const Clock& time)
+    void GSMainMenu::update(const Clock& time)
     {
-        // tick CEGUI
-        guiManager_->update(time);
     }
 
-    void GSGUI::startGame()
+    void GSMainMenu::startGame()
     {
         // HACK - HACK
         Game::getInstance().popState();
-        Game::getInstance().requestState("standalone");
-        Game::getInstance().requestState("level");
+        Game::getInstance().requestStates("standalone, level");
     }
 }