[Orxonox-commit 4909] r9578 - in code/branches/core6/src: libraries/core libraries/core/command libraries/core/input libraries/network modules/designtools modules/questsystem orxonox orxonox/gamestates orxonox/sound
landauf at orxonox.net
landauf at orxonox.net
Mon Mar 25 23:05:13 CET 2013
Author: landauf
Date: 2013-03-25 23:05:13 +0100 (Mon, 25 Mar 2013)
New Revision: 9578
Modified:
code/branches/core6/src/libraries/core/Core.h
code/branches/core6/src/libraries/core/Game.h
code/branches/core6/src/libraries/core/GraphicsManager.h
code/branches/core6/src/libraries/core/command/Shell.cc
code/branches/core6/src/libraries/core/input/InputBuffer.h
code/branches/core6/src/libraries/core/input/InputManager.cc
code/branches/core6/src/libraries/core/input/KeyBinderManager.h
code/branches/core6/src/libraries/network/WANDiscovery.h
code/branches/core6/src/modules/designtools/ScreenshotManager.h
code/branches/core6/src/modules/designtools/SkyboxGenerator.h
code/branches/core6/src/modules/questsystem/QuestManager.cc
code/branches/core6/src/modules/questsystem/QuestManager.h
code/branches/core6/src/orxonox/CameraManager.cc
code/branches/core6/src/orxonox/CameraManager.h
code/branches/core6/src/orxonox/LevelManager.h
code/branches/core6/src/orxonox/MoodManager.h
code/branches/core6/src/orxonox/gamestates/GSMainMenu.h
code/branches/core6/src/orxonox/sound/SoundManager.h
Log:
made some classes (mostly singletons) inherit from Configurable instead of OrxonoxClass when they only need the config value facilities
Modified: code/branches/core6/src/libraries/core/Core.h
===================================================================
--- code/branches/core6/src/libraries/core/Core.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/libraries/core/Core.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -65,7 +65,7 @@
@remark
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>;
friend class Game;
Modified: code/branches/core6/src/libraries/core/Game.h
===================================================================
--- code/branches/core6/src/libraries/core/Game.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/libraries/core/Game.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -49,7 +49,7 @@
#include "util/Output.h"
#include "util/DestructionHelper.h"
#include "util/Singleton.h"
-#include "class/OrxonoxClass.h"
+#include "config/Configurable.h"
/**
@brief
@@ -81,7 +81,7 @@
// tolua_begin
class _CoreExport Game
// tolua_end
- : public Singleton<Game>, public OrxonoxClass
+ : public Singleton<Game>, public Configurable
{ // tolua_export
friend class Singleton<Game>;
typedef std::vector<shared_ptr<GameState> > GameStateVector;
Modified: code/branches/core6/src/libraries/core/GraphicsManager.h
===================================================================
--- code/branches/core6/src/libraries/core/GraphicsManager.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/libraries/core/GraphicsManager.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -51,7 +51,7 @@
#include "util/DestructionHelper.h"
#include "util/Singleton.h"
-#include "class/OrxonoxClass.h"
+#include "config/Configurable.h"
// tolua_begin
namespace orxonox
@@ -62,7 +62,7 @@
*/
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>;
public:
Modified: code/branches/core6/src/libraries/core/command/Shell.cc
===================================================================
--- code/branches/core6/src/libraries/core/command/Shell.cc 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/libraries/core/command/Shell.cc 2013-03-25 22:05:13 UTC (rev 9578)
@@ -95,7 +95,7 @@
*/
Shell::~Shell()
{
- this->inputBuffer_->destroy();
+ delete this->inputBuffer_;
OutputManager::getInstance().unregisterListener(this);
}
Modified: code/branches/core6/src/libraries/core/input/InputBuffer.h
===================================================================
--- code/branches/core6/src/libraries/core/input/InputBuffer.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/libraries/core/input/InputBuffer.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -33,7 +33,7 @@
#include <list>
#include <string>
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
#include "InputHandler.h"
namespace orxonox
@@ -73,7 +73,7 @@
void (T::*function_)();
};
- class _CoreExport InputBuffer : public InputHandler, public OrxonoxClass
+ class _CoreExport InputBuffer : public InputHandler, public Configurable
{
public:
InputBuffer();
Modified: code/branches/core6/src/libraries/core/input/InputManager.cc
===================================================================
--- code/branches/core6/src/libraries/core/input/InputManager.cc 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/libraries/core/input/InputManager.cc 2013-03-25 22:05:13 UTC (rev 9578)
@@ -279,7 +279,7 @@
// Destroy calibrator helper handler and state
this->destroyState("calibrator");
// Destroy KeyDetector and state
- calibratorCallbackHandler_->destroy();
+ delete calibratorCallbackHandler_;
// Destroy the empty InputState
this->destroyStateInternal(this->emptyState_);
Modified: code/branches/core6/src/libraries/core/input/KeyBinderManager.h
===================================================================
--- code/branches/core6/src/libraries/core/input/KeyBinderManager.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/libraries/core/input/KeyBinderManager.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -35,7 +35,7 @@
#include <string>
#include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
namespace orxonox //tolua_export
{ //tolua_export
@@ -52,7 +52,7 @@
will not work as expected!
*/
class _CoreExport KeyBinderManager //tolua_export
- : public Singleton<KeyBinderManager>, public OrxonoxClass
+ : public Singleton<KeyBinderManager>, public Configurable
{ //tolua_export
friend class Singleton<KeyBinderManager>;
public:
Modified: code/branches/core6/src/libraries/network/WANDiscovery.h
===================================================================
--- code/branches/core6/src/libraries/network/WANDiscovery.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/libraries/network/WANDiscovery.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -31,7 +31,7 @@
#include "NetworkPrereqs.h"
#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"
#include "MasterServerProtocol.h"
@@ -46,7 +46,7 @@
class _NetworkExport WANDiscovery
// tolua_end
- : public OrxonoxClass
+ : public Configurable
{ // tolua_export
public:
/** constructor */
Modified: code/branches/core6/src/modules/designtools/ScreenshotManager.h
===================================================================
--- code/branches/core6/src/modules/designtools/ScreenshotManager.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/modules/designtools/ScreenshotManager.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -43,7 +43,7 @@
#include <OgreHardwarePixelBuffer.h>
#include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
namespace orxonox
{
@@ -60,7 +60,7 @@
Damian 'Mozork' Frick
@ingroup Designtools
*/
- class ScreenshotManager : public OrxonoxClass, public Singleton<ScreenshotManager>
+ class ScreenshotManager : public Configurable, public Singleton<ScreenshotManager>
{
friend class Singleton<ScreenshotManager>;
Modified: code/branches/core6/src/modules/designtools/SkyboxGenerator.h
===================================================================
--- code/branches/core6/src/modules/designtools/SkyboxGenerator.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/modules/designtools/SkyboxGenerator.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -35,7 +35,7 @@
#ifndef __SkyboxGenerator_h__
#define __SkyboxGenerator_h__
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
#include "util/Singleton.h"
#include "tools/interfaces/Tickable.h"
@@ -57,7 +57,7 @@
Damian 'Mozork' Frick
@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>;
Modified: code/branches/core6/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/branches/core6/src/modules/questsystem/QuestManager.cc 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/modules/questsystem/QuestManager.cc 2013-03-25 22:05:13 UTC (rev 9578)
@@ -37,7 +37,6 @@
#include "util/OrxAssert.h"
#include "util/ScopedSingletonManager.h"
#include "core/command/ConsoleCommand.h"
-#include "core/CoreIncludes.h"
#include "core/GUIManager.h"
#include "core/LuaState.h"
@@ -59,7 +58,6 @@
*/
QuestManager::QuestManager()
{
- RegisterRootObject(QuestManager);
orxout(internal_info, context::quests) << "QuestManager created." << endl;
}
Modified: code/branches/core6/src/modules/questsystem/QuestManager.h
===================================================================
--- code/branches/core6/src/modules/questsystem/QuestManager.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/modules/questsystem/QuestManager.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -42,7 +42,6 @@
#include <string>
#include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
namespace orxonox // tolua_export
{ // tolua_export
@@ -58,7 +57,7 @@
@ingroup Questsystem
*/
class _QuestsystemExport QuestManager // tolua_export
- : public Singleton<QuestManager>, public orxonox::OrxonoxClass
+ : public Singleton<QuestManager>
{ // tolua_export
friend class Singleton<QuestManager>;
Modified: code/branches/core6/src/orxonox/CameraManager.cc
===================================================================
--- code/branches/core6/src/orxonox/CameraManager.cc 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/orxonox/CameraManager.cc 2013-03-25 22:05:13 UTC (rev 9578)
@@ -47,8 +47,6 @@
CameraManager::CameraManager()
{
- RegisterRootObject(CameraManager);
-
assert(GameMode::showsGraphics());
}
Modified: code/branches/core6/src/orxonox/CameraManager.h
===================================================================
--- code/branches/core6/src/orxonox/CameraManager.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/orxonox/CameraManager.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -40,11 +40,10 @@
#include <list>
#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>;
public:
Modified: code/branches/core6/src/orxonox/LevelManager.h
===================================================================
--- code/branches/core6/src/orxonox/LevelManager.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/orxonox/LevelManager.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -45,7 +45,7 @@
#include "LevelInfo.h"
#include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
// tolua_begin
namespace orxonox
@@ -66,7 +66,7 @@
*/
class _OrxonoxExport LevelManager
// tolua_end
- : public Singleton<LevelManager>, public OrxonoxClass
+ : public Singleton<LevelManager>, public Configurable
{ // tolua_export
friend class Singleton<LevelManager>;
public:
Modified: code/branches/core6/src/orxonox/MoodManager.h
===================================================================
--- code/branches/core6/src/orxonox/MoodManager.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/orxonox/MoodManager.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -33,7 +33,7 @@
#include <string>
#include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
namespace orxonox
{
@@ -59,7 +59,7 @@
@brief
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>;
public:
@@ -73,7 +73,6 @@
static MoodManager& getInstance() { return Singleton<MoodManager>::getInstance(); }
private:
- ~MoodManager() {}
void checkMoodValidity();
// config values
Modified: code/branches/core6/src/orxonox/gamestates/GSMainMenu.h
===================================================================
--- code/branches/core6/src/orxonox/gamestates/GSMainMenu.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/orxonox/gamestates/GSMainMenu.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -33,11 +33,11 @@
#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:
GSMainMenu(const GameStateInfo& info);
Modified: code/branches/core6/src/orxonox/sound/SoundManager.h
===================================================================
--- code/branches/core6/src/orxonox/sound/SoundManager.h 2013-03-25 21:20:21 UTC (rev 9577)
+++ code/branches/core6/src/orxonox/sound/SoundManager.h 2013-03-25 22:05:13 UTC (rev 9578)
@@ -38,7 +38,7 @@
#include <boost/shared_ptr.hpp>
#include "util/Singleton.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
#include "core/object/SmartPtr.h"
// tolua_begin
@@ -58,7 +58,7 @@
//! The SoundManager class manages the OpenAL device, context and listener position.
class _OrxonoxExport SoundManager
// tolua_end
- : public Singleton<SoundManager>, public OrxonoxClass
+ : public Singleton<SoundManager>, public Configurable
{ // tolua_export
friend class Singleton<SoundManager>;
More information about the Orxonox-commit
mailing list