[Orxonox-commit 1438] r6156 - code/branches/presentation2/src/libraries/core

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-11-25 22:59:42 +0100 (Wed, 25 Nov 2009)
New Revision: 6156

Modified:
   code/branches/presentation2/src/libraries/core/GUIManager.cc
   code/branches/presentation2/src/libraries/core/GUIManager.h
Log:
cleanup in GUIManager
most functionality now in lua


Modified: code/branches/presentation2/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/GUIManager.cc	2009-11-25 19:02:22 UTC (rev 6155)
+++ code/branches/presentation2/src/libraries/core/GUIManager.cc	2009-11-25 21:59:42 UTC (rev 6156)
@@ -214,11 +214,6 @@
     */
     /*static*/ void GUIManager::showGUI(const std::string& name, bool hidePrevious, bool showCursor)
     {
-        std::pair<std::set<std::string>::iterator,bool> result = GUIManager::getInstance().showingGUIs_.insert(name);
-        if(GUIManager::getInstance().showingGUIs_.size() == 1 && result.second == true) //!< If it's the first GUI.
-        {
-//             InputManager::getInstance().enterState("guiMouseOnly");
-        }
         GUIManager::getInstance().executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ")");
     }
 
@@ -228,12 +223,6 @@
     */
     void GUIManager::showGUIExtra(const std::string& name, const std::string& ptr, bool hidePrevious, bool showCursor)
     {
-        std::pair<std::set<std::string>::iterator,bool> result = this->showingGUIs_.insert(name);
-        if(this->showingGUIs_.size() == 1 && result.second == true) //!< If it's the first GUI.
-        {
-//             this->executeCode("showCursor()");
-//             InputManager::getInstance().enterState("guiMouseOnly");
-        }
         this->executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ", " + ptr + ")");
     }
 
@@ -245,13 +234,7 @@
     */
     /*static*/ void GUIManager::hideGUI(const std::string& name)
     {
-        GUIManager::getInstance().showingGUIs_.erase(name);
         GUIManager::getInstance().executeCode("hideGUI(\"" + name + "\")");
-        if(GUIManager::getInstance().showingGUIs_.size() == 0)
-        {
-//             GUIManager::getInstance().executeCode("hideCursor()");
-//             InputManager::getInstance().leaveState("guiMouseOnly");
-        }
     }
 
     void GUIManager::toggleIngameGUI()

Modified: code/branches/presentation2/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/presentation2/src/libraries/core/GUIManager.h	2009-11-25 19:02:22 UTC (rev 6155)
+++ code/branches/presentation2/src/libraries/core/GUIManager.h	2009-11-25 21:59:42 UTC (rev 6156)
@@ -87,8 +87,6 @@
     private:
         GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)
 
-        std::set<std::string> showingGUIs_; //!< Keeps track of all the GUIs that are currently showing.
-
         void executeCode(const std::string& str);
 
         // keyHandler functions