Changeset 6595 for code/branches/gamestates2/src/libraries/core/GUIManager.cc

Timestamp:

Mar 22, 2010, 2:47:10 PM (14 years ago)

Author:

rgrieder

Message:

Merged remaining revisions from gamestate to gamestates2.

Location:

code/branches/gamestates2

Files:

• . (modified) (1 prop)
• src/libraries/core/GUIManager.cc (modified) (6 diffs)

code/branches/gamestates2/src/libraries/core/GUIManager.cc

@@ -57 +57 @@
 #include "ConsoleCommand.h"
 #include "Core.h"
+#include "GraphicsManager.h"
 #include "LuaState.h"
 #include "PathConfig.h"
 #include "Resource.h"
+#include "input/InputManager.h"
+#include "input/InputState.h"
+#include "input/KeyBinderManager.h"
 
 namespace orxonox
@@ -108 +112 @@
     @return true if success, otherwise false
     */
-    GUIManager::GUIManager(Ogre::RenderWindow* renderWindow, const std::pair<int, int>& mousePosition, bool bFullScreen)
-        : renderWindow_(renderWindow)
-        , resourceProvider_(0)
+    GUIManager::GUIManager(const std::pair<int, int>& mousePosition)
+        : resourceProvider_(NULL)
         , camera_(NULL)
-        , bShowIngameGUI_(false)
     {
         using namespace CEGUI;
@@ -119 +121 @@
 
         // Note: No SceneManager specified yet
-        guiRenderer_.reset(new OgreCEGUIRenderer(renderWindow_, Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
+        guiRenderer_.reset(new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
         resourceProvider_ = guiRenderer_->createResourceProvider();
         resourceProvider_->setDefaultResourceGroup("GUI");
@@ -141 +143 @@
         guiSystem_.reset(new System(guiRenderer_.get(), resourceProvider_, 0, scriptModule_.get()));
 
+        // Align CEGUI mouse with OIS mouse
+        guiSystem_->injectMousePosition((float)mousePosition.first, (float)mousePosition.second);
+
+        // Hide the mouse cursor unless playing in full screen mode
+        if (!GraphicsManager::getInstance().isFullScreen())
+            CEGUI::MouseCursor::getSingleton().hide();
+
         // Initialise the basic Lua code
         this->luaState_->doFile("InitialiseGUI.lua");
-
-        // Align CEGUI mouse with OIS mouse
-        guiSystem_->injectMousePosition((float)mousePosition.first, (float)mousePosition.second);
-
-        // Hide the mouse cursor unless playing in full screen mode
-        if (!bFullScreen)
-            CEGUI::MouseCursor::getSingleton().hide();
     }
 
@@ -208 +210 @@
     }
 
+    /** Loads a GUI sheet by Lua script
+    @param name
+        The name of the GUI (like the script name, but without the extension)
+    */
+    void GUIManager::loadGUI(const std::string& name)
+    {
+        this->executeCode("loadGUI(\"" + name + "\")");
+    }
+
     /**
     @brief
@@ -240 +251 @@
     {
         GUIManager::getInstance().executeCode("hideGUI(\"" + name + "\")");
+    }
+
+    const std::string& GUIManager::createInputState(const std::string& name, TriBool::Value showMouse, TriBool::Value useKeyboard, bool bBlockJoyStick)
+    {
+        InputState* state = InputManager::getInstance().createInputState(name);
+
+        if (GraphicsManager::getInstance().isFullScreen() && showMouse == TriBool::True ||
+           !GraphicsManager::getInstance().isFullScreen() && showMouse == TriBool::False)
+            state->setMouseExclusive(TriBool::True);
+        else
+            state->setMouseExclusive(TriBool::Dontcare);
+
+        if (showMouse == TriBool::True)
+            state->setMouseHandler(this);
+        else if (showMouse == TriBool::False)
+            state->setMouseHandler(&InputHandler::EMPTY);
+
+        if (useKeyboard == TriBool::True)
+            state->setKeyHandler(this);
+        else if (useKeyboard == TriBool::False)
+            state->setKeyHandler(&InputHandler::EMPTY);
+
+        if (bBlockJoyStick)
+            state->setJoyStickHandler(&InputHandler::EMPTY);
+
+        return state->getName();
     }