Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6156


Ignore:
Timestamp:
Nov 25, 2009, 10:59:42 PM (15 years ago)
Author:
scheusso
Message:

cleanup in GUIManager
most functionality now in lua

Location:
code/branches/presentation2/src/libraries/core
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/src/libraries/core/GUIManager.cc

    r6150 r6156  
    215215    /*static*/ void GUIManager::showGUI(const std::string& name, bool hidePrevious, bool showCursor)
    216216    {
    217         std::pair<std::set<std::string>::iterator,bool> result = GUIManager::getInstance().showingGUIs_.insert(name);
    218         if(GUIManager::getInstance().showingGUIs_.size() == 1 && result.second == true) //!< If it's the first GUI.
    219         {
    220 //             InputManager::getInstance().enterState("guiMouseOnly");
    221         }
    222217        GUIManager::getInstance().executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ")");
    223218    }
     
    229224    void GUIManager::showGUIExtra(const std::string& name, const std::string& ptr, bool hidePrevious, bool showCursor)
    230225    {
    231         std::pair<std::set<std::string>::iterator,bool> result = this->showingGUIs_.insert(name);
    232         if(this->showingGUIs_.size() == 1 && result.second == true) //!< If it's the first GUI.
    233         {
    234 //             this->executeCode("showCursor()");
    235 //             InputManager::getInstance().enterState("guiMouseOnly");
    236         }
    237226        this->executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ", " + ptr + ")");
    238227    }
     
    246235    /*static*/ void GUIManager::hideGUI(const std::string& name)
    247236    {
    248         GUIManager::getInstance().showingGUIs_.erase(name);
    249237        GUIManager::getInstance().executeCode("hideGUI(\"" + name + "\")");
    250         if(GUIManager::getInstance().showingGUIs_.size() == 0)
    251         {
    252 //             GUIManager::getInstance().executeCode("hideCursor()");
    253 //             InputManager::getInstance().leaveState("guiMouseOnly");
    254         }
    255238    }
    256239
  • code/branches/presentation2/src/libraries/core/GUIManager.h

    r6150 r6156  
    8888        GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)
    8989
    90         std::set<std::string> showingGUIs_; //!< Keeps track of all the GUIs that are currently showing.
    91 
    9290        void executeCode(const std::string& str);
    9391
Note: See TracChangeset for help on using the changeset viewer.