Changeset 3337

Timestamp:

Jul 23, 2009, 1:34:31 PM (15 years ago)

Author:

rgrieder

Message:

Removed GUIOverlay management from GUIManager: It shouldn't be the GUIManager's responsibility to handle some overlays.

Location:

code/branches/resource/src/orxonox

Files:

• gui/GUIManager.cc (modified) (2 diffs)
• gui/GUIManager.h (modified) (2 diffs)
• objects/quest/QuestManager.cc (modified) (2 diffs)
• overlays/GUIOverlay.cc (modified) (1 diff)

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

@@ -287 +287 @@
     /**
     @brief
-        Registers a GUIOverlay with the GUIManager so that the GUIOverlay can be accessed by it's name through the GUIManager.
-    @param name
-        The name of the GUI.
-    @param overlay
-        A pointer to the GUIOverlay of the GUI.
-    @return
-        Returns false if the Overlay was already present.
-    */
-    bool GUIManager::registerOverlay(const std::string& name, GUIOverlay* overlay)
-    {
-        return (this->guiOverlays_.insert(std::pair<std::string, GUIOverlay*>(name, overlay))).second;
-    }
-
-    /**
-    @brief
-        Get the GUIOverlay of the GUI with the given name.
-    @param name
-        The name of the GUI.
-    @return
-        Returns a pointer to the GUIOverlay.
-    */
-    GUIOverlay* GUIManager::getOverlay(const std::string& name)
-    {
-        return (this->guiOverlays_.find(name))->second;
-    }
-
-    /**
-    @brief
         Tells the GUIManager which SceneManager to use
     @param camera
@@ -321 +293 @@
         In fact the GUIManager needs the SceneManager and not the Camera to display the GUI.
         This means the GUI is not bound to a camera but rather to the SceneManager.
-        Hidding the GUI when needed can therefore not be solved by just NOT setting the current camera.
+        Hiding the GUI when needed can therefore not be resolved by just NOT setting the current camera.
     */
     void GUIManager::setCamera(Ogre::Camera* camera)

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

@@ -88 +88 @@
         void executeCode(const std::string& str);
 
-        bool registerOverlay(const std::string& name, GUIOverlay* overlay); //!< Register a GUIOverlay with the GUIManager.
-        GUIOverlay* getOverlay(const std::string& name); // Get the GUIOverlay of the GUI with the given name.
-
         void setCamera(Ogre::Camera* camera);
 
@@ -123 +120 @@
         State                       state_;             //!< reflects state of the GUIManager
 
-        std::map<std::string, GUIOverlay*> guiOverlays_;//!< A list of all GUIOverlay's.
-
         static GUIManager*          singletonRef_s;     //!< Singleton reference to GUIManager
 

code/branches/resource/src/orxonox/objects/quest/QuestManager.cc

@@ -36 +36 @@
 #include "util/Exception.h"
 #include "core/CoreIncludes.h"
-#include "gui/GUIManager.h"
 
 #include "objects/infos/PlayerInfo.h"
@@ -225 +224 @@
     QuestContainer* QuestManager::getQuestTree(std::string & name)
     {
-        GUIOverlay* gui = GUIManager::getInstance().getOverlay(name);
+        GUIOverlay* gui = NULL;
+        for (ObjectList<GUIOverlay>::iterator it = ObjectList<GUIOverlay>::begin(); it != ObjectList<GUIOverlay>::end(); ++it)
+            if (it->getGUIName() == name)
+                gui = *it;
 
         PlayerInfo* player;

code/branches/resource/src/orxonox/overlays/GUIOverlay.cc

@@ -55 +55 @@
 
         XMLPortParam(GUIOverlay, "guiname", setGUIName, getGUIName, xmlElement, mode);
-        
-        GUIManager::getInstance().registerOverlay(this->guiName_, this);
     }