[Orxonox-commit 5720] r10380 - in code/branches/core7/src: libraries/core libraries/core/input libraries/network modules/designtools modules/notifications modules/pickup orxonox orxonox/chat orxonox/collisionshapes orxonox/gamestates orxonox/interfaces orxonox/overlays orxonox/sound
landauf at orxonox.net
landauf at orxonox.net
Wed Apr 22 22:30:43 CEST 2015
Author: landauf
Date: 2015-04-22 22:30:42 +0200 (Wed, 22 Apr 2015)
New Revision: 10380
Modified:
code/branches/core7/src/libraries/core/GUIManager.cc
code/branches/core7/src/libraries/core/Game.cc
code/branches/core7/src/libraries/core/GraphicsManager.cc
code/branches/core7/src/libraries/core/input/InputManager.cc
code/branches/core7/src/libraries/core/input/JoyStickQuantityListener.cc
code/branches/core7/src/libraries/core/input/KeyBinder.cc
code/branches/core7/src/libraries/core/input/KeyBinderManager.cc
code/branches/core7/src/libraries/core/input/KeyDetector.cc
code/branches/core7/src/libraries/core/input/Mouse.cc
code/branches/core7/src/libraries/network/Host.cc
code/branches/core7/src/modules/designtools/ScreenshotManager.cc
code/branches/core7/src/modules/designtools/SkyboxGenerator.cc
code/branches/core7/src/modules/notifications/NotificationManager.cc
code/branches/core7/src/modules/pickup/PickupManager.cc
code/branches/core7/src/orxonox/LevelManager.cc
code/branches/core7/src/orxonox/MoodManager.cc
code/branches/core7/src/orxonox/PawnManager.cc
code/branches/core7/src/orxonox/PlayerManager.cc
code/branches/core7/src/orxonox/ShipPartManager.cc
code/branches/core7/src/orxonox/chat/ChatHistory.cc
code/branches/core7/src/orxonox/chat/ChatInputHandler.cc
code/branches/core7/src/orxonox/chat/ChatManager.cc
code/branches/core7/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
code/branches/core7/src/orxonox/gamestates/GSMainMenu.cc
code/branches/core7/src/orxonox/interfaces/NotificationListener.cc
code/branches/core7/src/orxonox/interfaces/PickupListener.cc
code/branches/core7/src/orxonox/overlays/InGameConsole.cc
code/branches/core7/src/orxonox/sound/AmbientSound.cc
code/branches/core7/src/orxonox/sound/SoundManager.cc
Log:
registered missing classes.
WorldEntityCollisionShape is the only class which was really missing, all other classes are singletons or part of the framework.
Modified: code/branches/core7/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/core7/src/libraries/core/GUIManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/libraries/core/GUIManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -254,6 +254,8 @@
SetConsoleCommand("hideGUI", &GUIManager::hideGUI);
SetConsoleCommand("toggleGUI", &GUIManager::toggleGUI).defaultValue(1, false).defaultValue(2, false);
+ RegisterAbstractClass(GUIManager).inheritsFrom<WindowEventListener>();
+
/**
@brief
Constructs the GUIManager by starting up CEGUI
Modified: code/branches/core7/src/libraries/core/Game.cc
===================================================================
--- code/branches/core7/src/libraries/core/Game.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/libraries/core/Game.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -76,6 +76,8 @@
std::vector<shared_ptr<GameStateTreeNode> > children_;
};
+ RegisterAbstractClass(Game).inheritsFrom<Configurable>();
+
Game::Game(const std::string& cmdLine)
: gameClock_(NULL)
, core_(NULL)
Modified: code/branches/core7/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/core7/src/libraries/core/GraphicsManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/libraries/core/GraphicsManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -93,6 +93,8 @@
GraphicsManager* GraphicsManager::singletonPtr_s = 0;
+ RegisterAbstractClass(GraphicsManager).inheritsFrom<Configurable>();
+
GraphicsManager::GraphicsManager(bool bLoadRenderer)
: ogreWindowEventListener_(new OgreWindowEventListener())
, renderWindow_(0)
Modified: code/branches/core7/src/libraries/core/input/InputManager.cc
===================================================================
--- code/branches/core7/src/libraries/core/input/InputManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/libraries/core/input/InputManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -85,6 +85,8 @@
return (lval = (InputManager::State)(lval & rval));
}
+ RegisterAbstractClass(InputManager).inheritsFrom<WindowEventListener>();
+
// ############################################################
// ##### Initialisation #####
// ########## ##########
Modified: code/branches/core7/src/libraries/core/input/JoyStickQuantityListener.cc
===================================================================
--- code/branches/core7/src/libraries/core/input/JoyStickQuantityListener.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/libraries/core/input/JoyStickQuantityListener.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -35,6 +35,8 @@
{
std::vector<JoyStick*> JoyStickQuantityListener::joyStickList_s;
+ RegisterAbstractClass(JoyStickQuantityListener).inheritsFrom<Listable>();
+
JoyStickQuantityListener::JoyStickQuantityListener()
{
RegisterObject(JoyStickQuantityListener);
Modified: code/branches/core7/src/libraries/core/input/KeyBinder.cc
===================================================================
--- code/branches/core7/src/libraries/core/input/KeyBinder.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/libraries/core/input/KeyBinder.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -42,6 +42,8 @@
namespace orxonox
{
+ RegisterAbstractClass(KeyBinder).inheritsFrom<JoyStickQuantityListener>();
+
/**
@brief
Constructor that does as little as necessary.
Modified: code/branches/core7/src/libraries/core/input/KeyBinderManager.cc
===================================================================
--- code/branches/core7/src/libraries/core/input/KeyBinderManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/libraries/core/input/KeyBinderManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -52,6 +52,8 @@
SetConsoleCommand(__CC_unbind_name, &KeyBinderManager::unbind).defaultValues("");
SetConsoleCommand(__CC_tunbind_name, &KeyBinderManager::tunbind).defaultValues("");
+ RegisterAbstractClass(KeyBinderManager).inheritsFrom<Configurable>();
+
KeyBinderManager::KeyBinderManager()
: currentBinder_(NULL)
, bDefaultFileLoaded_(true)
Modified: code/branches/core7/src/libraries/core/input/KeyDetector.cc
===================================================================
--- code/branches/core7/src/libraries/core/input/KeyDetector.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/libraries/core/input/KeyDetector.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -42,6 +42,8 @@
static const std::string __CC_KeyDetector_callback_name = "KeyDetectorKeyPressed";
DeclareConsoleCommand(__CC_KeyDetector_callback_name, &prototype::void__string).hide();
+ RegisterAbstractClass(KeyDetector).inheritsFrom<KeyBinder>();
+
KeyDetector::KeyDetector()
: KeyBinder("")
{
Modified: code/branches/core7/src/libraries/core/input/Mouse.cc
===================================================================
--- code/branches/core7/src/libraries/core/input/Mouse.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/libraries/core/input/Mouse.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -50,6 +50,8 @@
SetConsoleCommand(__CC_Mouse_name, __CC_ungrab_name, &Mouse::ungrab);
#endif
+ RegisterAbstractClass(Mouse).inheritsFrom<WindowEventListener>();
+
Mouse::Mouse(unsigned int id, OIS::InputManager* oisInputManager)
: super(id, oisInputManager)
{
Modified: code/branches/core7/src/libraries/network/Host.cc
===================================================================
--- code/branches/core7/src/libraries/network/Host.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/libraries/network/Host.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -142,6 +142,8 @@
// NetworkChatListener //
//////////////////////////////////////////////////////////////////////////
+ RegisterAbstractClass(NetworkChatListener).inheritsFrom<Listable>();
+
NetworkChatListener::NetworkChatListener()
{
RegisterObject(NetworkChatListener);
Modified: code/branches/core7/src/modules/designtools/ScreenshotManager.cc
===================================================================
--- code/branches/core7/src/modules/designtools/ScreenshotManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/modules/designtools/ScreenshotManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -62,6 +62,8 @@
ManageScopedSingleton(ScreenshotManager, ScopeID::Graphics, false);
+ RegisterAbstractClass(ScreenshotManager).inheritsFrom<Configurable>();
+
/**
@brief
Constructor.
Modified: code/branches/core7/src/modules/designtools/SkyboxGenerator.cc
===================================================================
--- code/branches/core7/src/modules/designtools/SkyboxGenerator.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/modules/designtools/SkyboxGenerator.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -61,6 +61,8 @@
ManageScopedSingleton(SkyboxGenerator, ScopeID::Graphics, false);
+ RegisterAbstractClass(SkyboxGenerator).inheritsFrom<Configurable>().inheritsFrom<Tickable>();
+
/**
@brief
Constructor. Registers and initializes the singleton.
Modified: code/branches/core7/src/modules/notifications/NotificationManager.cc
===================================================================
--- code/branches/core7/src/modules/notifications/NotificationManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/modules/notifications/NotificationManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -48,6 +48,8 @@
ManageScopedSingleton(NotificationManager, ScopeID::Root, false);
+ RegisterAbstractClass(NotificationManager).inheritsFrom<NotificationListener>();
+
/**
@brief
Constructor. Registers the Object.
Modified: code/branches/core7/src/modules/pickup/PickupManager.cc
===================================================================
--- code/branches/core7/src/modules/pickup/PickupManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/modules/pickup/PickupManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -61,6 +61,8 @@
registerStaticNetworkFunction(PickupManager::dropPickupNetworked);
registerStaticNetworkFunction(PickupManager::usePickupNetworked);
+ RegisterAbstractClass(PickupManager).inheritsFrom<PickupListener>();
+
/**
@brief
Constructor. Registers the PickupManager and creates the default PickupRepresentation.
Modified: code/branches/core7/src/orxonox/LevelManager.cc
===================================================================
--- code/branches/core7/src/orxonox/LevelManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/LevelManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -52,6 +52,8 @@
ManageScopedSingleton(LevelManager, ScopeID::Root, false);
+ RegisterAbstractClass(LevelManager).inheritsFrom<Configurable>();
+
/**
@brief
Constructor. Registers the object, sets config values and initializes variables.
Modified: code/branches/core7/src/orxonox/MoodManager.cc
===================================================================
--- code/branches/core7/src/orxonox/MoodManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/MoodManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -40,6 +40,9 @@
// Note: I'm (Kevin Young) not entirely sure whether that's good code style:
const std::string MoodManager::defaultMood_ = "default";
+ RegisterAbstractClass(MoodListener).inheritsFrom<OrxonoxInterface>();
+ RegisterAbstractClass(MoodManager).inheritsFrom<Configurable>();
+
MoodManager::MoodManager()
{
RegisterObject(MoodManager);
Modified: code/branches/core7/src/orxonox/PawnManager.cc
===================================================================
--- code/branches/core7/src/orxonox/PawnManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/PawnManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -36,6 +36,8 @@
{
ManageScopedSingleton(PawnManager, ScopeID::Root, false);
+ RegisterAbstractClass(PawnManager).inheritsFrom<Tickable>();
+
PawnManager::PawnManager()
{
RegisterObject(PawnManager);
Modified: code/branches/core7/src/orxonox/PlayerManager.cc
===================================================================
--- code/branches/core7/src/orxonox/PlayerManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/PlayerManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -40,6 +40,8 @@
{
ManageScopedSingleton(PlayerManager, ScopeID::Root, false);
+ RegisterAbstractClass(PlayerManager).inheritsFrom<ClientConnectionListener>();
+
PlayerManager::PlayerManager()
{
RegisterObject(PlayerManager);
Modified: code/branches/core7/src/orxonox/ShipPartManager.cc
===================================================================
--- code/branches/core7/src/orxonox/ShipPartManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/ShipPartManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -36,6 +36,8 @@
{
ManageScopedSingleton(ShipPartManager, ScopeID::Root, false);
+ RegisterAbstractClass(ShipPartManager).inheritsFrom<Tickable>();
+
ShipPartManager::ShipPartManager()
{
RegisterObject(ShipPartManager);
Modified: code/branches/core7/src/orxonox/chat/ChatHistory.cc
===================================================================
--- code/branches/core7/src/orxonox/chat/ChatHistory.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/chat/ChatHistory.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -34,6 +34,9 @@
{
/* singleton */
ManageScopedSingleton( ChatHistory, ScopeID::Root, false );
+
+ RegisterAbstractClass(ChatHistory).inheritsFrom<ChatListener>();
+
#endif
/* constructor */
Modified: code/branches/core7/src/orxonox/chat/ChatInputHandler.cc
===================================================================
--- code/branches/core7/src/orxonox/chat/ChatInputHandler.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/chat/ChatInputHandler.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -67,6 +67,8 @@
SetConsoleCommand( "startchat", &ChatInputHandler::activate_static );
SetConsoleCommand( "startchat_small", &ChatInputHandler::activate_small_static );
+ RegisterAbstractClass(ChatInputHandler).inheritsFrom<ChatListener>();
+
/* constructor */
ChatInputHandler::ChatInputHandler()
{
Modified: code/branches/core7/src/orxonox/chat/ChatManager.cc
===================================================================
--- code/branches/core7/src/orxonox/chat/ChatManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/chat/ChatManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -43,6 +43,8 @@
SetConsoleCommand("chat", &ChatManager::chat).defaultValue(1, NETWORK_PEER_ID_BROADCAST);
+ RegisterAbstractClass(ChatManager).inheritsFrom<NetworkChatListener>();
+
ChatManager::ChatManager()
{
RegisterObject(ChatManager);
Modified: code/branches/core7/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
===================================================================
--- code/branches/core7/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -36,6 +36,8 @@
namespace orxonox
{
+ RegisterClass(WorldEntityCollisionShape);
+
WorldEntityCollisionShape::WorldEntityCollisionShape(Context* context) : CompoundCollisionShape(context)
{
RegisterObject(WorldEntityCollisionShape);
Modified: code/branches/core7/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/core7/src/orxonox/gamestates/GSMainMenu.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/gamestates/GSMainMenu.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -62,6 +62,8 @@
SetConsoleCommand(__CC_startDedicated_name, &GSMainMenu::startDedicated ).defaultValues("").deactivate();
SetConsoleCommand(__CC_setMainMenuSoundPath_name, &GSMainMenu::setMainMenuSoundPath).hide();
+ RegisterAbstractClass(GSMainMenu).inheritsFrom<Configurable>();
+
GSMainMenu::GSMainMenu(const GameStateInfo& info)
: GameState(info)
{
Modified: code/branches/core7/src/orxonox/interfaces/NotificationListener.cc
===================================================================
--- code/branches/core7/src/orxonox/interfaces/NotificationListener.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/interfaces/NotificationListener.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -50,6 +50,8 @@
registerStaticNetworkFunction(NotificationListener::sendHelper);
+ RegisterAbstractClass(NotificationListener).inheritsFrom<OrxonoxInterface>();
+
NotificationListener::NotificationListener()
{
RegisterObject(NotificationListener);
Modified: code/branches/core7/src/orxonox/interfaces/PickupListener.cc
===================================================================
--- code/branches/core7/src/orxonox/interfaces/PickupListener.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/interfaces/PickupListener.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -39,6 +39,7 @@
namespace orxonox
{
+ RegisterAbstractClass(PickupListener).inheritsFrom<OrxonoxInterface>();
/**
@brief
Modified: code/branches/core7/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/core7/src/orxonox/overlays/InGameConsole.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/overlays/InGameConsole.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -66,6 +66,8 @@
ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false);
+ RegisterAbstractClass(InGameConsole).inheritsFrom<WindowEventListener>();
+
/**
@brief Constructor: Creates and initializes the InGameConsole.
*/
Modified: code/branches/core7/src/orxonox/sound/AmbientSound.cc
===================================================================
--- code/branches/core7/src/orxonox/sound/AmbientSound.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/sound/AmbientSound.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -35,6 +35,8 @@
namespace orxonox
{
+ RegisterAbstractClass(AmbientSound).inheritsFrom<BaseSound>().inheritsFrom<MoodListener>();
+
AmbientSound::AmbientSound()
: bPlayOnLoad_(false)
{
Modified: code/branches/core7/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/core7/src/orxonox/sound/SoundManager.cc 2015-04-22 20:29:21 UTC (rev 10379)
+++ code/branches/core7/src/orxonox/sound/SoundManager.cc 2015-04-22 20:30:42 UTC (rev 10380)
@@ -65,6 +65,8 @@
}
}
+ RegisterAbstractClass(SoundManager).inheritsFrom<Configurable>();
+
SoundManager::SoundManager()
: effectsPoolSize_(0)
{
More information about the Orxonox-commit
mailing list