[Orxonox-commit 351] r2962 - trunk/src/orxonox/gui
dafrick at orxonox.net
dafrick at orxonox.net
Sun May 10 23:38:28 CEST 2009
Author: dafrick
Date: 2009-05-10 23:38:28 +0200 (Sun, 10 May 2009)
New Revision: 2962
Modified:
trunk/src/orxonox/gui/GUIManager.h
Log:
Created collecting of GUIOverlays in the GUIManager to make the accessible through the GUIManager.
Modified: trunk/src/orxonox/gui/GUIManager.h
===================================================================
--- trunk/src/orxonox/gui/GUIManager.h 2009-05-10 20:49:36 UTC (rev 2961)
+++ trunk/src/orxonox/gui/GUIManager.h 2009-05-10 21:38:28 UTC (rev 2962)
@@ -40,6 +40,8 @@
#include <CEGUIInputEvent.h>
#include <CEGUISystem.h>
#include "core/input/InputInterfaces.h"
+#include <map>
+#include "overlays/GUIOverlay.h"
// Forward declaration
namespace CEGUI { class DefaultLogger; }
@@ -86,6 +88,9 @@
void showGUI(const std::string& name);
void executeCode(const std::string& str);
+ bool registerOverlay(std::string name, GUIOverlay* overlay); //!< Register a GUIOverlay with the GUIManager.
+ GUIOverlay* getOverlay(std::string name); // Get the GUIOverlay of the GUI with the given name.
+
void setCamera(Ogre::Camera* camera);
static GUIManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; } // tolua_export
@@ -128,7 +133,10 @@
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
+
}; // tolua_export
} // tolua_export
More information about the Orxonox-commit
mailing list