Changeset 2887 for code/branches

Timestamp:

Apr 2, 2009, 5:03:16 PM (16 years ago)

Author:

bknecht

Message:

first part of finishing up to merge back. solving some issues I ran into with Lua

Location:

code/branches/gui/src/orxonox

Files:

• gamestates/GSLevel.cc (modified) (2 diffs)
• gamestates/GSMainMenu.cc (modified) (2 diffs)
• gui/GUIManager.cc (modified) (1 diff)
• gui/GUIManager.h (modified) (1 diff)

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

@@ -133 +133 @@
             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 +140 @@
     void GSLevel::showIngameGUI(bool show)
     {
-        COUT(0) << "*** Call works with \"" << (show ? "true" : "false") << "\" as param" << std::endl;
         if (show)
         {
             GUIManager::getInstancePtr()->showGUI("inGameTest");
+            GUIManager::getInstancePtr()->executeCode("showCursor()");
             InputManager::getInstance().requestEnterState("guiMouseOnly");
         }
         else
         {
-            GUIManager::getInstancePtr()->executeCode("hideGUI(inGameTest)");
+            GUIManager::getInstancePtr()->executeCode("hideGUI(\"inGameTest\")");
+            GUIManager::getInstancePtr()->executeCode("hideCursor()");
             InputManager::getInstance().requestLeaveState("guiMouseOnly");
         }

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

@@ -86 +86 @@
         InputManager::getInstance().requestDestroyState("mainMenu");
 
+/*
         if (this->ccStartGame_)
         {
@@ -91 +92 @@
             this->ccStartGame_ = 0;
         }
+*/
     }
 

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

@@ -250 +250 @@
     /**
     @brief
-        Debug function to give CEGUI the possibility to output on our console
-    @param
-        String to be displaed in CEGUI's name
-
-        This function should be removed as it only provides a quick (and dirty) possibility to access the output on the console.
-        CEGUI's output should be put into the cegui.log using the CEGUI Logger.
-    */
-    void GUIManager::testOutput(std::string& str)
-    {
-        COUT(0) << "*** CEGUI: " << str << std::endl;
-    }
-
-    /**
-    @brief
         Displays specified GUI on screen
     @param name

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

@@ -89 +89 @@
         void setCamera(Ogre::Camera* camera);
 
-        void testOutput(std::string& str); // tolua_export
-
         static GUIManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; } // tolua_export
         static GUIManager* getInstancePtr() { return singletonRef_s; }