Changeset 9578

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

Files:

• libraries/core/Core.h (modified) (1 diff)
• libraries/core/Game.h (modified) (2 diffs)
• libraries/core/GraphicsManager.h (modified) (2 diffs)
• libraries/core/command/Shell.cc (modified) (1 diff)
• libraries/core/input/InputBuffer.h (modified) (2 diffs)
• libraries/core/input/InputManager.cc (modified) (1 diff)
• libraries/core/input/KeyBinderManager.h (modified) (2 diffs)
• libraries/network/WANDiscovery.h (modified) (2 diffs)
• modules/designtools/ScreenshotManager.h (modified) (2 diffs)
• modules/designtools/SkyboxGenerator.h (modified) (2 diffs)
• modules/questsystem/QuestManager.cc (modified) (2 diffs)
• modules/questsystem/QuestManager.h (modified) (2 diffs)
• orxonox/CameraManager.cc (modified) (1 diff)
• orxonox/CameraManager.h (modified) (1 diff)
• orxonox/LevelManager.h (modified) (2 diffs)
• orxonox/MoodManager.h (modified) (3 diffs)
• orxonox/gamestates/GSMainMenu.h (modified) (1 diff)
• orxonox/sound/SoundManager.h (modified) (2 diffs)

code/branches/core6/src/libraries/core/Core.h

@@ -66 +66 @@
         You should only create this singleton once because it destroys the identifiers!
     */
-    class _CoreExport Core : public Singleton<Core>, public OrxonoxClass
+    class _CoreExport Core : public Singleton<Core>, public Configurable
     {
         friend class Singleton<Core>;

code/branches/core6/src/libraries/core/Game.h

@@ -50 +50 @@
 #include "util/DestructionHelper.h"
 #include "util/Singleton.h"
-#include "class/OrxonoxClass.h"
+#include "config/Configurable.h"
 
 /**
@@ -82 +82 @@
     class _CoreExport Game
 // tolua_end
-        : public Singleton<Game>, public OrxonoxClass
+        : public Singleton<Game>, public Configurable
     { // tolua_export
         friend class Singleton<Game>;

code/branches/core6/src/libraries/core/GraphicsManager.h

@@ -52 +52 @@
 #include "util/DestructionHelper.h"
 #include "util/Singleton.h"
-#include "class/OrxonoxClass.h"
+#include "config/Configurable.h"
 
 // tolua_begin
@@ -63 +63 @@
     class _CoreExport GraphicsManager
 // tolua_end
-        : public Singleton<GraphicsManager>, public OrxonoxClass, public Ogre::LogListener
+        : public Singleton<GraphicsManager>, public Configurable, public Ogre::LogListener
     { // tolua_export
         friend class Singleton<GraphicsManager>;

code/branches/core6/src/libraries/core/command/Shell.cc

@@ -96 +96 @@
     Shell::~Shell()
     {
-        this->inputBuffer_->destroy();
+        delete this->inputBuffer_;
 
         OutputManager::getInstance().unregisterListener(this);

code/branches/core6/src/libraries/core/input/InputBuffer.h

@@ -34 +34 @@
 #include <list>
 #include <string>
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 #include "InputHandler.h"
 
@@ -74 +74 @@
     };
 
-    class _CoreExport InputBuffer : public InputHandler, public OrxonoxClass
+    class _CoreExport InputBuffer : public InputHandler, public Configurable
     {
         public:

code/branches/core6/src/libraries/core/input/InputManager.cc

@@ -280 +280 @@
         this->destroyState("calibrator");
         // Destroy KeyDetector and state
-        calibratorCallbackHandler_->destroy();
+        delete calibratorCallbackHandler_;
         // Destroy the empty InputState
         this->destroyStateInternal(this->emptyState_);

code/branches/core6/src/libraries/core/input/KeyBinderManager.h

@@ -36 +36 @@
 
 #include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 
 namespace orxonox //tolua_export
@@ -53 +53 @@
     */
     class _CoreExport KeyBinderManager //tolua_export
-        : public Singleton<KeyBinderManager>, public OrxonoxClass
+        : public Singleton<KeyBinderManager>, public Configurable
     { //tolua_export
         friend class Singleton<KeyBinderManager>;

code/branches/core6/src/libraries/network/WANDiscovery.h

@@ -32 +32 @@
 #include "packet/ServerInformation.h"
 #include "core/CoreIncludes.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 #include "core/config/ConfigValueIncludes.h"
 #include "MasterServerComm.h"
@@ -47 +47 @@
   class _NetworkExport WANDiscovery
 // tolua_end
-    : public OrxonoxClass
+    : public Configurable
   { // tolua_export
     public:

code/branches/core6/src/modules/designtools/ScreenshotManager.h

@@ -44 +44 @@
 
 #include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 
 namespace orxonox
@@ -61 +61 @@
     @ingroup Designtools
     */
-    class ScreenshotManager : public OrxonoxClass, public Singleton<ScreenshotManager>
+    class ScreenshotManager : public Configurable, public Singleton<ScreenshotManager>
     {
         friend class Singleton<ScreenshotManager>;

code/branches/core6/src/modules/designtools/SkyboxGenerator.h

@@ -36 +36 @@
 #define __SkyboxGenerator_h__
 
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 #include "util/Singleton.h"
 #include "tools/interfaces/Tickable.h"
@@ -58 +58 @@
     @ingroup Designtools
     */
-    class SkyboxGenerator : public virtual OrxonoxClass, public Singleton<SkyboxGenerator>, public Tickable
+    class SkyboxGenerator : public virtual Configurable, public Singleton<SkyboxGenerator>, public Tickable
     {
         friend class Singleton<SkyboxGenerator>;

code/branches/core6/src/modules/questsystem/QuestManager.cc

@@ -38 +38 @@
 #include "util/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommand.h"
-#include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
 #include "core/LuaState.h"
@@ -60 +59 @@
     QuestManager::QuestManager()
     {
-        RegisterRootObject(QuestManager);
         orxout(internal_info, context::quests) << "QuestManager created." << endl;
     }

code/branches/core6/src/modules/questsystem/QuestManager.h

@@ -43 +43 @@
 
 #include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
 
 namespace orxonox  // tolua_export
@@ -59 +58 @@
     */
     class _QuestsystemExport QuestManager  // tolua_export
-        : public Singleton<QuestManager>, public orxonox::OrxonoxClass
+        : public Singleton<QuestManager>
     { // tolua_export
 

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>;