Changeset 3339 for code/branches/resource/src/orxonox/gui/GUIManager.h

Timestamp:

Jul 23, 2009, 8:04:51 PM (16 years ago)

Author:

rgrieder

Message:

Moved GUIManager::getLevelList to LevelManager because the GUIManager has nothing to do with levels.
I also had to change the way the information flows: Instead of operation on the Lua state, you tell the LevelManager to compile the list and then get the elements one by one.
The reason for this change is simple: There is no way to know from which LuaState the call came (without making an ugly hack in Tolua itself).

File:

• code/branches/resource/src/orxonox/gui/GUIManager.h (modified) (4 diffs)

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

@@ -47 +47 @@
 #include "core/input/InputHandler.h"
 
-// tolua_begin
 namespace orxonox
 {
@@ -61 +60 @@
         Those input events are then injected into CEGUI in Lua.
     */
-    class _OrxonoxExport GUIManager
-// tolua_end
-        : public InputHandler
-// tolua_begin
+    class _OrxonoxExport GUIManager : public InputHandler
     {
-// tolua_end
     public:
         GUIManager(Ogre::RenderWindow* renderWindow);
@@ -78 +73 @@
         void setCamera(Ogre::Camera* camera);
 
-        static GUIManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; } // tolua_export
+        static GUIManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; }
         static GUIManager* getInstancePtr() { return singletonRef_s; }
 
-        void getLevelList(); //tolua_export
-
     private:
-        GUIManager(const GUIManager& instance);                 //!< private constructor (this is a singleton class)
+        GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)
 
         void loadLuaCode();
@@ -108 +101 @@
         static GUIManager*       singletonRef_s;    //!< Singleton reference to GUIManager
 
-    }; // tolua_export
-} // tolua_export
+    };
+}
 
 #endif /* _GUIManager_H__ */