Changeset 10407 for code/branches/core7/src/orxonox

Timestamp:

Apr 27, 2015, 11:08:26 PM (10 years ago)

Author:

landauf

Message:

moved Scope and ScopedSingletonManager from util to core.
TODO I had to disable two tests in ScopeTest.cc because now that it runs in the core library, there are too many singletons which get loaded in graphics scope (with too many dependencies). this should be fixed

Location:

code/branches/core7/src/orxonox

Files:

• CameraManager.cc (modified) (1 diff)
• LevelManager.cc (modified) (1 diff)
• MoodManager.cc (modified) (1 diff)
• PawnManager.cc (modified) (1 diff)
• PlayerManager.cc (modified) (1 diff)
• ShipPartManager.cc (modified) (1 diff)
• chat/ChatHistory.cc (modified) (1 diff)
• chat/ChatInputHandler.cc (modified) (1 diff)
• chat/ChatManager.cc (modified) (1 diff)
• overlays/InGameConsole.cc (modified) (2 diffs)
• sound/SoundManager.cc (modified) (1 diff)

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

@@ -35 +35 @@
 #include <OgreCompositorManager.h>
 
-#include "util/ScopedSingletonManager.h"
 #include "core/GameMode.h"
 #include "core/GraphicsManager.h"
 #include "core/object/ObjectList.h"
+#include "core/singleton/ScopedSingletonManager.h"
 #include "tools/Shader.h"
 #include "graphics/Camera.h"

code/branches/core7/src/orxonox/LevelManager.cc

@@ -36 +36 @@
 #include <map>
 
-#include "util/ScopedSingletonManager.h"
+#include "core/singleton/ScopedSingletonManager.h"
 #include "core/commandline/CommandLineIncludes.h"
 #include "core/config/ConfigValueIncludes.h"

code/branches/core7/src/orxonox/MoodManager.cc

@@ -29 +29 @@
 #include "MoodManager.h"
 
-#include "util/ScopedSingletonManager.h"
+#include "core/singleton/ScopedSingletonManager.h"
 #include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"

code/branches/core7/src/orxonox/PawnManager.cc

@@ -29 +29 @@
 #include "PawnManager.h"
 
-#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
+#include "core/singleton/ScopedSingletonManager.h"
 #include "worldentities/pawns/Pawn.h"
 

code/branches/core7/src/orxonox/PlayerManager.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "util/ScopedSingletonManager.h"
+#include "core/singleton/ScopedSingletonManager.h"
 
 #include "Level.h"

code/branches/core7/src/orxonox/ShipPartManager.cc

@@ -29 +29 @@
 #include "ShipPartManager.h"
 
-#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
+#include "core/singleton/ScopedSingletonManager.h"
 #include "items/ShipPart.h"
 

code/branches/core7/src/orxonox/chat/ChatHistory.cc

@@ -28 +28 @@
 
 #include "ChatHistory.h"
-#include "util/ScopedSingletonManager.h"
+#include "core/singleton/ScopedSingletonManager.h"
 
 #ifndef CHATTEST

code/branches/core7/src/orxonox/chat/ChatInputHandler.cc

@@ -47 +47 @@
 #endif
 
-#include "util/ScopedSingletonManager.h"
+#include "core/singleton/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"

code/branches/core7/src/orxonox/chat/ChatManager.cc

@@ -30 +30 @@
 #include "ChatListener.h"
 
-#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
+#include "core/singleton/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommandIncludes.h"
 #include "network/Host.h"

code/branches/core7/src/orxonox/overlays/InGameConsole.cc

@@ -45 +45 @@
 #include "util/Math.h"
 #include "util/DisplayStringConversions.h"
-#include "util/ScopedSingletonManager.h"
 #include "util/output/MemoryWriter.h"
 #include "util/output/OutputManager.h"
@@ -51 +50 @@
 #include "core/config/ConfigValueIncludes.h"
 #include "core/command/ConsoleCommandIncludes.h"
+#include "core/singleton/ScopedSingletonManager.h"
 #include "core/GUIManager.h"
 #include "core/input/InputManager.h"

code/branches/core7/src/orxonox/sound/SoundManager.cc

@@ -38 +38 @@
 #include "util/Math.h"
 #include "util/Clock.h"
-#include "util/ScopedSingletonManager.h"
+#include "core/singleton/ScopedSingletonManager.h"
 #include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"