Changeset 2869 for code

Timestamp:

Mar 30, 2009, 11:34:51 PM (16 years ago)

Author:

bknecht

Message:

Including some features to use only mouse or keys in a GUI, also cleaning up the calls to GUIManager, also trying to show and hide a GUI just by tabbing a key. Anyways, more features to come soonsvn status

Location:

code/branches/gui/src/orxonox

Files:

• gamestates/GSGraphics.cc (modified) (4 diffs)
• gamestates/GSGraphics.h (modified) (2 diffs)
• gamestates/GSLevel.cc (modified) (6 diffs)
• gamestates/GSLevel.h (modified) (3 diffs)
• gamestates/GSMainMenu.cc (modified) (2 diffs)
• gamestates/GSStandalone.cc (modified) (2 diffs)
• gamestates/GSStandalone.h (modified) (1 diff)
• gui/GUIManager.cc (modified) (2 diffs)

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

@@ -36 +36 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/Clock.h"
+#include "core/ConsoleCommand.h"
 #include "core/Core.h"
 #include "core/CoreIncludes.h"
@@ -110 +111 @@
         guiManager_->initialise(renderWindow);
 
+        FunctorMember<GSGraphics>* functor = createFunctor(&GSGraphics::toggleGUI);
+        functor->setObject(this);
+        this->ccToggleGUI_ = createConsoleCommand(functor, "toggleGUI");
+        CommandExecutor::addConsoleCommandShortcut(this->ccToggleGUI_);
+
+
         InputManager::getInstance().requestEnterState("master");
     }
@@ -115 +122 @@
     void GSGraphics::deactivate()
     {
+
+        if (this->ccToggleGUI_)
+        {
+            delete this->ccToggleGUI_;
+            this->ccToggleGUI_ = 0;
+        }
+
         masterInputState_->setHandler(0);
         InputManager::getInstance().requestDestroyState("master");
@@ -131 +145 @@
 
         GameMode::setShowsGraphics(false);
+    }
+
+    void GSGraphics::toggleGUI()
+    {
+            GUIManager::getInstance().executeCode("toggleGUI()");
     }
 

code/branches/gui/src/orxonox/gamestates/GSGraphics.h

@@ -47 +47 @@
         void update(const Clock& time);
 
+        void toggleGUI();
+
     private:
         // Window events from WindowEventListener
@@ -61 +63 @@
         SimpleInputState*     masterInputState_;
         XMLFile*              debugOverlay_;
+        ConsoleCommand*       ccToggleGUI_;
     };
 }

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

@@ -56 +56 @@
 
     SetCommandLineArgument(level, "presentation.oxw").shortcut("l");
+    SetConsoleCommand(GSLevel, showIngameGUI, true).keybindMode(KeybindMode::OnPress).keybindMode(KeybindMode::OnRelease);
 
     GSLevel::GSLevel(const std::string& name)
         : GameState(name)
         , keyBinder_(0)
-        , inputState_(0)
+        , gameInputState_(0)
+        , guiMouseOnlyInputState_(0)
+        , guiKeysOnlyInputState_(0)
         , radar_(0)
         , startFile_(0)
@@ -87 +90 @@
         if (GameMode::showsGraphics())
         {
-            {
-                FunctorMember<GSLevel>* functor = createFunctor(&GSLevel::toggleGUI);
-                functor->setObject(this);
-                this->ccToggleGUI_ = createConsoleCommand(functor, "toggleGUI");
-                CommandExecutor::addConsoleCommandShortcut(this->ccToggleGUI_);
-            }
-
-            inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("game");
+            gameInputState_ = InputManager::getInstance().createInputState<SimpleInputState>("game");
             keyBinder_ = new KeyBinder();
             keyBinder_->loadBindings("keybindings.ini");
-            inputState_->setHandler(keyBinder_);
+            gameInputState_->setHandler(keyBinder_);
+
+            guiMouseOnlyInputState_ = InputManager::getInstance().createInputState<SimpleInputState>("guiMouseOnly");
+            guiMouseOnlyInputState_->setMouseHandler(GUIManager::getInstancePtr());
+
+            guiKeysOnlyInputState_ = InputManager::getInstance().createInputState<SimpleInputState>("guiKeysOnly");
+            guiKeysOnlyInputState_->setKeyHandler(GUIManager::getInstancePtr());
 
             // create the global CameraManager
@@ -138 +140 @@
     }
 
+    void GSLevel::showIngameGUI(bool show)
+    {
+        COUT(0) << "*** Call works with \"" << (show ? "true" : "false") << "\" as param" << std::endl;
+        if (show)
+        {
+            GUIManager::getInstancePtr()->showGUI("inGameTest");
+            InputManager::getInstance().requestEnterState("guiMouseOnly");
+        }
+        else
+        {
+            GUIManager::getInstancePtr()->executeCode("hideGUI(inGameTest)");
+            InputManager::getInstance().requestLeaveState("guiMouseOnly");
+        }
+    }
+
     void GSLevel::deactivate()
     {
@@ -150 +167 @@
             delete this->ccTkeybind_;
             this->ccTkeybind_ = 0;
-        }
-        if (this->ccToggleGUI_)
-        {
-            delete this->ccToggleGUI_;
-            this->ccToggleGUI_ = 0;
         }
 
@@ -196 +208 @@
         if (GameMode::showsGraphics())
         {
-            inputState_->setHandler(0);
+            gameInputState_->setHandler(0);
+            guiMouseOnlyInputState_->setHandler(0);
+            guiKeysOnlyInputState_->setHandler(0);
             InputManager::getInstance().requestDestroyState("game");
             if (this->keyBinder_)
@@ -233 +247 @@
 
         delete this->startFile_;
-    }
-
-    void GSLevel::toggleGUI()
-    {
-        if (GameMode::showsGraphics())
-        {
-            GUIManager::getInstance().executeCode("toggleGUI()");
-        }
     }
 

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

@@ -47 +47 @@
         void update(const Clock& time);
 
-        void toggleGUI();
+        static void showIngameGUI(bool show);
 
     protected:
@@ -58 +58 @@
         void keybindInternal(const std::string& command, bool bTemporary);
 
-        KeyBinder*            keyBinder_;        //!< tool that loads and manages the input bindings
-        SimpleInputState*     inputState_;
-        Radar*                radar_;            //!< represents the Radar (not the HUD part)
-        XMLFile*              startFile_;        //!< current hard coded default level
+        KeyBinder*            keyBinder_;               //!< tool that loads and manages the input bindings
+        SimpleInputState*     gameInputState_;          //!< input state for normal ingame playing
+        SimpleInputState*     guiMouseOnlyInputState_;  //!< input state if we only need the mouse to use the GUI
+        SimpleInputState*     guiKeysOnlyInputState_;   //!< input state if we only need the keys to use the GUI
+        Radar*                radar_;                   //!< represents the Radar (not the HUD part)
+        XMLFile*              startFile_;               //!< current hard coded default level
         CameraManager*        cameraManager_;
         LevelManager*         levelManager_;
@@ -72 +74 @@
         ConsoleCommand*       ccKeybind_;
         ConsoleCommand*       ccTkeybind_;
-        ConsoleCommand*       ccToggleGUI_;
     };
 }

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

@@ -83 +83 @@
     void GSMainMenu::deactivate()
     {
-        InputManager::getInstance().requestLeaveState("game");
-        InputManager::getInstance().requestDestroyState("game");
+        InputManager::getInstance().requestLeaveState("mainMenu");
+        InputManager::getInstance().requestDestroyState("mainMenu");
 
         if (this->ccStartGame_)
@@ -91 +91 @@
             this->ccStartGame_ = 0;
         }
-
-        GUIManager::getInstance().executeCode("hideGUI()");
     }
 

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

@@ -55 +55 @@
     {
         GameMode::setIsStandalone(true);
-
-        guiManager_ = GUIManager::getInstancePtr();
-        // not sure if necessary
-        // guiManager_->loadScene("IngameMenu");
     }
 
@@ -68 +64 @@
     void GSStandalone::update(const Clock& time)
     {
-        //Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
-        //COUT(0) << "** " << viewport->getCamera()->getSceneManager() << std::endl;
-        //guiManager_->testFct();
-        //Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
-        //guiManager_->showGUI("IngameMenu", viewport->getCamera()->getSceneManager());
-
-        // tick CEGUI
-        guiManager_->update(time);
     }
 }

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

@@ -46 +46 @@
 
     private:
-        GUIManager* guiManager_;
     };
 }

code/branches/gui/src/orxonox/gui/GUIManager.cc

@@ -23 +23 @@
  *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Benjamin Knecht
  *
  */
@@ -195 +195 @@
         if (state_ != Uninitialised)
         {
-            COUT(3) << "Loading GUI " << name << std::endl;
+            //COUT(3) << "Loading GUI " << name << std::endl;
             try
             {