Changeset 3346

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

Files:

• core/CMakeLists.txt (modified) (2 diffs)
• core/CorePrereqs.h (modified) (3 diffs)
• core/GUIManager.cc (copied) (copied from code/branches/resource/src/orxonox/gui/GUIManager.cc) (1 diff)
• core/GUIManager.h (copied) (copied from code/branches/resource/src/orxonox/gui/GUIManager.h) (3 diffs)
• core/GraphicsManager.cc (moved) (moved from code/branches/resource/src/orxonox/GraphicsManager.cc) (2 diffs)
• core/GraphicsManager.h (moved) (moved from code/branches/resource/src/orxonox/GraphicsManager.h) (2 diffs)
• orxonox/CMakeLists.txt (modified) (5 diffs)
• orxonox/CameraManager.cc (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (4 diffs)
• orxonox/gamestates/GSGraphics.cc (modified) (3 diffs)
• orxonox/gamestates/GSLevel.cc (modified) (2 diffs)
• orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
• orxonox/gui (deleted)
• orxonox/objects/pickup/PickupInventory.cc (modified) (1 diff)
• orxonox/objects/pickup/PickupSpawner.cc (modified) (1 diff)
• orxonox/overlays/GUIOverlay.cc (modified) (1 diff)
• orxonox/tools/ParticleInterface.cc (modified) (1 diff)
• orxonox/tools/Shader.cc (modified) (1 diff)

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:

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

@@ -20 +20 @@
 SET_SOURCE_FILES(ORXONOX_SRC_FILES
   CameraManager.cc
-  GraphicsManager.cc
   LevelManager.cc
   Main.cc
@@ -27 +26 @@
 )
 ADD_SUBDIRECTORY(gamestates)
-ADD_SUBDIRECTORY(gui)
 ADD_SUBDIRECTORY(interfaces)
 ADD_SUBDIRECTORY(objects)
@@ -43 +41 @@
   TOLUA_FILES
     LevelManager.h
-    gui/GUIManager.h
     objects/pickup/BaseItem.h
     objects/pickup/PickupInventory.h
@@ -53 +50 @@
   ${ORXONOX_WIN32}
   LINK_LIBRARIES
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
+    ${Boost_THREAD_LIBRARY}
+    ${Boost_DATE_TIME_LIBRARY} # Thread dependency
     ${OGRE_LIBRARY}
-    ${CEGUI_LIBRARY}
-    ${LUA_LIBRARIES}
-    ${CEGUILUA_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
     ${OPENAL_LIBRARY}
     ${ALUT_LIBRARY}
@@ -63 +60 @@
     ${VORBIS_LIBRARY}
     ${OGG_LIBRARY}
-    ogreceguirenderer_orxonox
     tinyxml++_orxonox
     tolua++_orxonox

code/branches/resource/src/orxonox/CameraManager.cc

@@ -34 +34 @@
 #include "util/StringUtils.h"
 #include "core/GameMode.h"
+#include "core/GUIManager.h"
 #include "core/ObjectList.h"
 #include "tools/Shader.h"
 #include "objects/worldentities/Camera.h"
 #include "objects/Scene.h"
-#include "gui/GUIManager.h"
 
 namespace orxonox

code/branches/resource/src/orxonox/OrxonoxPrereqs.h

@@ -73 +73 @@
         };
     }
-
-    class GraphicsManager;
-    class OgreWindowEventListener;
-    class Settings;
 
     class RadarViewable;
@@ -277 +273 @@
     class Map;
 
-    //gui
-    class GUIManager;
-
     //sound
     class SoundBase;
@@ -293 +286 @@
 }
 
-namespace CEGUI
-{
-    class DefaultLogger;
-    class Logger;
-    class LuaScriptModule;
-
-    class OgreCEGUIRenderer;
-    class OgreCEGUIResourceProvider;
-    class OgreCEGUITexture;
-}
-
 // Bullet Physics Engine
 class btTransform;
@@ -330 +312 @@
 typedef int ALint;
 
-// Lua
-struct lua_State;
-
 #endif /* _OrxonoxPrereqs_H__ */

code/branches/resource/src/orxonox/gamestates/GSGraphics.cc

@@ -45 +45 @@
 #include "core/Game.h"
 #include "core/GameMode.h"
+#include "core/GraphicsManager.h"
+#include "core/GUIManager.h"
 #include "core/input/InputManager.h"
 #include "core/input/KeyBinder.h"
@@ -51 +53 @@
 #include "core/XMLFile.h"
 #include "overlays/console/InGameConsole.h"
-#include "gui/GUIManager.h"
 #include "sound/SoundManager.h"
-#include "GraphicsManager.h"
+
+// HACK:
+#include "overlays/map/Map.h"
 
 namespace orxonox
@@ -169 +172 @@
         this->inputManager_ = 0;
 
+        // HACK:
+        Map::hackDestroyMap();
+
         delete graphicsManager_;
 

code/branches/resource/src/orxonox/gamestates/GSLevel.cc

@@ -40 +40 @@
 #include "core/GameMode.h"
 #include "core/Core.h"
+#include "core/GraphicsManager.h"
+#include "core/GUIManager.h"
 #include "core/Loader.h"
 #include "core/XMLFile.h"
@@ -47 +49 @@
 #include "objects/quest/QuestManager.h"
 #include "overlays/notifications/NotificationManager.h"
-#include "gui/GUIManager.h"
 #include "CameraManager.h"
-#include "GraphicsManager.h"
 #include "LevelManager.h"
 #include "PlayerManager.h"

code/branches/resource/src/orxonox/gamestates/GSMainMenu.cc

@@ -36 +36 @@
 #include "core/Clock.h"
 #include "core/ConsoleCommand.h"
+#include "core/GraphicsManager.h"
+#include "core/GUIManager.h"
 #include "objects/Scene.h"
-#include "gui/GUIManager.h"
 #include "sound/SoundMainMenu.h"
-#include "GraphicsManager.h"
 
 namespace orxonox

code/branches/resource/src/orxonox/objects/pickup/PickupInventory.cc

@@ -37 +37 @@
 
 #include "core/ConsoleCommand.h"
+#include "core/GUIManager.h"
 #include "core/input/InputManager.h"
-#include "gui/GUIManager.h"
 #include "objects/controllers/HumanController.h"
 #include "objects/worldentities/pawns/Pawn.h"

code/branches/resource/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -37 +37 @@
 
 #include "core/CoreIncludes.h"
+#include "core/GUIManager.h"     // HACK; see below
 #include "core/Template.h"
 #include "core/XMLPort.h"
-#include "gui/GUIManager.h"     // HACK; see below
 #include "objects/worldentities/pawns/Pawn.h"
 #include "PickupInventory.h"    // HACK; Only for hack, remove later

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

@@ -34 +34 @@
 #include "core/input/InputManager.h"
 #include "core/CoreIncludes.h"
+#include "core/GUIManager.h"
 #include "core/XMLPort.h"
-#include "gui/GUIManager.h"
 
 namespace orxonox

code/branches/resource/src/orxonox/tools/ParticleInterface.cc

@@ -45 +45 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/GameMode.h"
-#include "GraphicsManager.h"
 
 namespace orxonox

code/branches/resource/src/orxonox/tools/Shader.cc

@@ -41 +41 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "GraphicsManager.h"
+#include "core/GraphicsManager.h"
 
 namespace orxonox