Changeset 9578 for code/branches/core6/src/orxonox

Timestamp:

Mar 25, 2013, 11:05:13 PM (12 years ago)

Author:

landauf

Message:

made some classes (mostly singletons) inherit from Configurable instead of OrxonoxClass when they only need the config value facilities

Location:

code/branches/core6/src/orxonox

Files:

• CameraManager.cc (modified) (1 diff)
• CameraManager.h (modified) (1 diff)
• LevelManager.h (modified) (2 diffs)
• MoodManager.h (modified) (3 diffs)
• gamestates/GSMainMenu.h (modified) (1 diff)
• sound/SoundManager.h (modified) (2 diffs)

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

@@ -48 +48 @@
     CameraManager::CameraManager()
     {
-        RegisterRootObject(CameraManager);
-
         assert(GameMode::showsGraphics());
     }

code/branches/core6/src/orxonox/CameraManager.h

@@ -41 +41 @@
 #include "util/OgreForwardRefs.h"
 #include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport CameraManager : public Singleton<CameraManager>, public OrxonoxClass
+    class _OrxonoxExport CameraManager : public Singleton<CameraManager>
     {
             friend class Singleton<CameraManager>;

code/branches/core6/src/orxonox/LevelManager.h

@@ -46 +46 @@
 
 #include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 
 // tolua_begin
@@ -67 +67 @@
     class _OrxonoxExport LevelManager
     // tolua_end
-        : public Singleton<LevelManager>, public OrxonoxClass
+        : public Singleton<LevelManager>, public Configurable
     { // tolua_export
             friend class Singleton<LevelManager>;

code/branches/core6/src/orxonox/MoodManager.h

@@ -34 +34 @@
 #include <string>
 #include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 
 namespace orxonox
@@ -60 +60 @@
         The MoodManager class serves to allow for different musical themes in the game.
     */
-    class _OrxonoxExport MoodManager : public Singleton<MoodManager>, public OrxonoxClass
+    class _OrxonoxExport MoodManager : public Singleton<MoodManager>, public Configurable
     {
             friend class Singleton<MoodManager>;
@@ -74 +74 @@
 
         private:
-            ~MoodManager() {}
             void checkMoodValidity();
 

code/branches/core6/src/orxonox/gamestates/GSMainMenu.h

@@ -34 +34 @@
 #include "util/OgreForwardRefs.h"
 #include "core/GameState.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSMainMenu : public GameState, public OrxonoxClass
+    class _OrxonoxExport GSMainMenu : public GameState, public Configurable
     {
     public:

code/branches/core6/src/orxonox/sound/SoundManager.h

@@ -39 +39 @@
 
 #include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 #include "core/object/SmartPtr.h"
 
@@ -59 +59 @@
     class _OrxonoxExport SoundManager
     // tolua_end
-        : public Singleton<SoundManager>, public OrxonoxClass
+        : public Singleton<SoundManager>, public Configurable
     { // tolua_export
         friend class Singleton<SoundManager>;