Changeset 2850 for code/branches/gui/src/orxonox/gamestates/GSLevel.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/GSLevel.cc (modified) (6 diffs)

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

@@ -49 +49 @@
 #include "LevelManager.h"
 #include "PlayerManager.h"
+#include "gui/GUIManager.h"
 
 namespace orxonox
@@ -86 +87 @@
         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");
             keyBinder_ = new KeyBinder();
@@ -110 +118 @@
         if (GameMode::showsGraphics())
         {
-            // TODO: insert slomo console command with
-            // .accessLevel(AccessLevel::Offline).defaultValue(0, 1.0).axisParamIndex(0).isAxisRelative(false);
-
             // keybind console command
             FunctorMember<GSLevel>* functor1 = createFunctor(&GSLevel::keybind);
@@ -125 +130 @@
             InputManager::getInstance().setKeyDetectorCallback(std::string("keybind ") + keyDetectorCallbackCode_);
 
+            // InGame GUI test
+            GUIManager::getInstance().showGUI("inGameTest");
+
             // level is loaded: we can start capturing the input
             InputManager::getInstance().requestEnterState("game");
@@ -143 +151 @@
             this->ccTkeybind_ = 0;
         }
+        if (this->ccToggleGUI_)
+        {
+            delete this->ccToggleGUI_;
+            this->ccToggleGUI_ = 0;
+        }
+
 
         // this call will delete every BaseObject!
@@ -219 +233 @@
 
         delete this->startFile_;
+    }
+
+    void GSLevel::toggleGUI()
+    {
+        if (GameMode::showsGraphics())
+        {
+            GUIManager::getInstance().executeCode("toggleGUI()");
+        }
     }