Changeset 6741

Timestamp:

Apr 16, 2010, 12:50:52 PM (14 years ago)

Author:

rgrieder

Message:

Removed obsolete InputState from GSMainMenu.

Location:

code/branches/gamestates2/src/orxonox/gamestates

Files:

• GSMainMenu.cc (modified) (5 diffs)
• GSMainMenu.h (modified) (1 diff)

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

@@ -31 +31 @@
 #include <OgreSceneManager.h>
 
-#include "core/input/InputManager.h"
-#include "core/input/InputState.h"
 #include "core/input/KeyBinderManager.h"
 #include "core/Game.h"
@@ -49 +47 @@
     GSMainMenu::GSMainMenu(const GameStateInfo& info)
         : GameState(info)
-        , inputState_(0)
     {
         RegisterRootObject(GSMainMenu);
-        inputState_ = InputManager::getInstance().createInputState("mainMenu");
-        inputState_->setMouseExclusive(TriBool::False);
-        inputState_->setHandler(&GUIManager::getInstance());
-        inputState_->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
-        inputState_->setJoyStickHandler(&InputHandler::EMPTY);
 
         // create an empty Scene
@@ -75 +67 @@
         if (GameMode::playsSound())
             this->ambient_->destroy();
-
-        InputManager::getInstance().destroyState("mainMenu");
 
         this->scene_->getSceneManager()->destroyCamera(this->camera_);
@@ -100 +90 @@
 
         KeyBinderManager::getInstance().setToDefault();
-        //InputManager::getInstance().enterState("mainMenu");
 
         this->setConfigValues();
@@ -117 +106 @@
             this->ambient_->stop();
         }
-
-        //InputManager::getInstance().leaveState("mainMenu");
 
         GUIManager::getInstance().setCamera(0);

code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.h

@@ -61 +61 @@
 
     private:
-        InputState*       inputState_;
         Scene*            scene_;
         Ogre::Camera*     camera_;