Changeset 6156

Timestamp:

Nov 25, 2009, 10:59:42 PM (14 years ago)

Author:

scheusso

Message:

cleanup in GUIManager
most functionality now in lua

Location:

code/branches/presentation2/src/libraries/core

Files:

• GUIManager.cc (modified) (3 diffs)
• GUIManager.h (modified) (1 diff)

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

@@ -215 +215 @@
     /*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) + ")");
     }
@@ -229 +224 @@
     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 + ")");
     }
@@ -246 +235 @@
     /*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");
-        }
     }
 

code/branches/presentation2/src/libraries/core/GUIManager.h

@@ -88 +88 @@
         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);