[Orxonox-commit 225] r2887 - in branches/gui/src/orxonox: gamestates gui

[bknecht at orxonox.net]

Author: bknecht
Date: 2009-04-02 17:03:16 +0200 (Thu, 02 Apr 2009)
New Revision: 2887

Modified:
   branches/gui/src/orxonox/gamestates/GSLevel.cc
   branches/gui/src/orxonox/gamestates/GSMainMenu.cc
   branches/gui/src/orxonox/gui/GUIManager.cc
   branches/gui/src/orxonox/gui/GUIManager.h
Log:
first part of finishing up to merge back. solving some issues I ran into with Lua

Modified: branches/gui/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- branches/gui/src/orxonox/gamestates/GSLevel.cc	2009-04-02 14:07:24 UTC (rev 2886)
+++ branches/gui/src/orxonox/gamestates/GSLevel.cc	2009-04-02 15:03:16 UTC (rev 2887)
@@ -132,9 +132,6 @@
             // set our console command as callback for the key detector
             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");
         }
@@ -142,15 +139,16 @@
 
     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");
         }
     }

Modified: branches/gui/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- branches/gui/src/orxonox/gamestates/GSMainMenu.cc	2009-04-02 14:07:24 UTC (rev 2886)
+++ branches/gui/src/orxonox/gamestates/GSMainMenu.cc	2009-04-02 15:03:16 UTC (rev 2887)
@@ -85,11 +85,13 @@
         InputManager::getInstance().requestLeaveState("mainMenu");
         InputManager::getInstance().requestDestroyState("mainMenu");
 
+/*
         if (this->ccStartGame_)
         {
             delete this->ccStartGame_;
             this->ccStartGame_ = 0;
         }
+*/
     }
 
     void GSMainMenu::update(const Clock& time)

Modified: branches/gui/src/orxonox/gui/GUIManager.cc
===================================================================
--- branches/gui/src/orxonox/gui/GUIManager.cc	2009-04-02 14:07:24 UTC (rev 2886)
+++ branches/gui/src/orxonox/gui/GUIManager.cc	2009-04-02 15:03:16 UTC (rev 2887)
@@ -249,20 +249,6 @@
 
     /**
     @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
         The name of the GUI

Modified: branches/gui/src/orxonox/gui/GUIManager.h
===================================================================
--- branches/gui/src/orxonox/gui/GUIManager.h	2009-04-02 14:07:24 UTC (rev 2886)
+++ branches/gui/src/orxonox/gui/GUIManager.h	2009-04-02 15:03:16 UTC (rev 2887)
@@ -88,8 +88,6 @@
 
         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; }