Changeset 3346 for code/branches/resource/src/core

Timestamp:

Jul 24, 2009, 9:37:19 PM (15 years ago)

Author:

rgrieder

Message:

Moved GraphicsManager and GUIManager to the core. Almost no actual code changes though, just moving (here was that Map-hack I had to move to GSGraphics).

Location:

code/branches/resource/src/core

Files:

• CMakeLists.txt (modified) (2 diffs)
• CorePrereqs.h (modified) (3 diffs)
• GUIManager.cc (copied) (copied from code/branches/resource/src/orxonox/gui/GUIManager.cc) (1 diff)
• GUIManager.h (copied) (copied from code/branches/resource/src/orxonox/gui/GUIManager.h) (3 diffs)
• GraphicsManager.cc (moved) (moved from code/branches/resource/src/orxonox/GraphicsManager.cc) (2 diffs)
• GraphicsManager.h (moved) (moved from code/branches/resource/src/orxonox/GraphicsManager.h) (2 diffs)

code/branches/resource/src/core/CMakeLists.txt

@@ -27 +27 @@
   GameMode.cc
   GameState.cc
+  GraphicsManager.cc
+  GUIManager.cc
   Language.cc
   LuaBind.cc
@@ -80 +82 @@
   LINK_LIBRARIES
     ${OGRE_LIBRARY}
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
     ${Boost_THREAD_LIBRARY}
-    ${Boost_FILESYSTEM_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${Boost_DATE_TIME_LIBRARY} # MSVC only
+    ${Boost_DATE_TIME_LIBRARY} # Thread dependency
+    ${CEGUI_LIBRARY}
+    ${CEGUILUA_LIBRARY}
     ${LUA_LIBRARIES}
     cpptcl_orxonox
+    ogreceguirenderer_orxonox
     ois_orxonox
     tinyxml++_orxonox

code/branches/resource/src/core/CorePrereqs.h

@@ -123 +123 @@
     class FunctorMember;
     class FunctorStatic;
+    class GraphicsManager;
+    class GUIManager;
     class Identifier;
     class IRC;
@@ -144 +146 @@
     template <class T>
     class ObjectListIterator;
+    class OgreWindowEventListener;
     class OrxonoxClass;
     class Shell;
@@ -220 +223 @@
 }
 
+// CEGUI
+namespace CEGUI
+{
+    class DefaultLogger;
+    class Logger;
+    class LuaScriptModule;
+
+    class OgreCEGUIRenderer;
+    class OgreCEGUIResourceProvider;
+    class OgreCEGUITexture;
+}
+
+// Lua
+struct lua_State;
+
 // TinyXML and TinyXML++
 class TiXmlString;

code/branches/resource/src/core/GUIManager.cc

@@ -57 +57 @@
 #include "util/Exception.h"
 #include "util/OrxAssert.h"
-#include "core/Core.h"
-#include "core/Clock.h"
-#include "core/LuaBind.h"
+#include "Core.h"
+#include "Clock.h"
+#include "LuaBind.h"
 
 namespace orxonox

code/branches/resource/src/core/GUIManager.h

@@ -37 +37 @@
 #define _GUIManager_H__
 
-#include "OrxonoxPrereqs.h"
+#include "CorePrereqs.h"
 
 #include <map>
@@ -45 +45 @@
 
 #include "util/OgreForwardRefs.h"
-#include "core/input/InputHandler.h"
+#include "input/InputHandler.h"
 
 namespace orxonox
@@ -60 +60 @@
         Those input events are then injected into CEGUI in Lua.
     */
-    class _OrxonoxExport GUIManager : public InputHandler
+    class _CoreExport GUIManager : public InputHandler
     {
     public:

code/branches/resource/src/core/GraphicsManager.cc

@@ -57 +57 @@
 #include "util/StringUtils.h"
 #include "util/SubString.h"
-#include "core/Clock.h"
-#include "core/ConsoleCommand.h"
-#include "core/ConfigValueIncludes.h"
-#include "core/CoreIncludes.h"
-#include "core/Core.h"
-#include "core/Game.h"
-#include "core/GameMode.h"
-#include "core/WindowEventListener.h"
-#include "tools/ParticleInterface.h"
-
-// HACK!
-#include "overlays/map/Map.h"
+#include "Clock.h"
+#include "ConsoleCommand.h"
+#include "ConfigValueIncludes.h"
+#include "CoreIncludes.h"
+#include "Core.h"
+#include "Game.h"
+#include "GameMode.h"
+#include "WindowEventListener.h"
 
 namespace orxonox
@@ -148 +144 @@
 */
 
-        // HACK! This fixes an exit crash
-        Map::hackDestroyMap();
         // unload all compositors (this is only necessary because we don't yet destroy all resources!)
         Ogre::CompositorManager::getSingleton().removeAll();

code/branches/resource/src/core/GraphicsManager.h

@@ -37 +37 @@
 #define _GraphicsManager_H__
 
-#include "OrxonoxPrereqs.h"
+#include "CorePrereqs.h"
 
 #include <cassert>
 #include <string>
 #include <OgreLog.h>
-#include "core/OrxonoxClass.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox
@@ -50 +50 @@
         Graphics engine manager class
     */
-    class _OrxonoxExport GraphicsManager : public OrxonoxClass, public Ogre::LogListener
+    class _CoreExport GraphicsManager : public OrxonoxClass, public Ogre::LogListener
     {
     public: