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

Timestamp:

Apr 22, 2015, 10:30:42 PM (10 years ago)

Author:

landauf

Message:

registered missing classes.
WorldEntityCollisionShape is the only class which was really missing, all other classes are singletons or part of the framework.

Location:

code/branches/core7/src/orxonox

Files:

• 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)
• collisionshapes/WorldEntityCollisionShape.cc (modified) (1 diff)
• gamestates/GSMainMenu.cc (modified) (1 diff)
• interfaces/NotificationListener.cc (modified) (1 diff)
• interfaces/PickupListener.cc (modified) (1 diff)
• overlays/InGameConsole.cc (modified) (1 diff)
• sound/AmbientSound.cc (modified) (1 diff)
• sound/SoundManager.cc (modified) (1 diff)

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

@@ -53 +53 @@
     ManageScopedSingleton(LevelManager, ScopeID::Root, false);
 
+    RegisterAbstractClass(LevelManager).inheritsFrom<Configurable>();
+
     /**
     @brief

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

@@ -40 +40 @@
     // 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()

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

@@ -37 +37 @@
     ManageScopedSingleton(PawnManager, ScopeID::Root, false);
 
+    RegisterAbstractClass(PawnManager).inheritsFrom<Tickable>();
+
     PawnManager::PawnManager()
     {

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

@@ -40 +40 @@
 {
     ManageScopedSingleton(PlayerManager, ScopeID::Root, false);
+
+    RegisterAbstractClass(PlayerManager).inheritsFrom<ClientConnectionListener>();
 
     PlayerManager::PlayerManager()

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

@@ -37 +37 @@
     ManageScopedSingleton(ShipPartManager, ScopeID::Root, false);
 
+    RegisterAbstractClass(ShipPartManager).inheritsFrom<Tickable>();
+
     ShipPartManager::ShipPartManager()
     {

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

@@ -35 +35 @@
   /* singleton */
   ManageScopedSingleton( ChatHistory, ScopeID::Root, false );
+
+  RegisterAbstractClass(ChatHistory).inheritsFrom<ChatListener>();
+
 #endif
 

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

@@ -68 +68 @@
   SetConsoleCommand( "startchat_small", &ChatInputHandler::activate_small_static );
 
+  RegisterAbstractClass(ChatInputHandler).inheritsFrom<ChatListener>();
+
   /* constructor */
   ChatInputHandler::ChatInputHandler()

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

@@ -43 +43 @@
 
     SetConsoleCommand("chat", &ChatManager::chat).defaultValue(1, NETWORK_PEER_ID_BROADCAST);
+
+    RegisterAbstractClass(ChatManager).inheritsFrom<NetworkChatListener>();
 
     ChatManager::ChatManager()

code/branches/core7/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

@@ -37 +37 @@
 namespace orxonox
 {
+    RegisterClass(WorldEntityCollisionShape);
+
     WorldEntityCollisionShape::WorldEntityCollisionShape(Context* context) : CompoundCollisionShape(context)
     {

code/branches/core7/src/orxonox/gamestates/GSMainMenu.cc

@@ -63 +63 @@
     SetConsoleCommand(__CC_setMainMenuSoundPath_name, &GSMainMenu::setMainMenuSoundPath).hide();
 
+    RegisterAbstractClass(GSMainMenu).inheritsFrom<Configurable>();
+
     GSMainMenu::GSMainMenu(const GameStateInfo& info)
         : GameState(info)

code/branches/core7/src/orxonox/interfaces/NotificationListener.cc

@@ -51 +51 @@
     registerStaticNetworkFunction(NotificationListener::sendHelper);
     
+    RegisterAbstractClass(NotificationListener).inheritsFrom<OrxonoxInterface>();
+
     NotificationListener::NotificationListener()
     {

code/branches/core7/src/orxonox/interfaces/PickupListener.cc

@@ -40 +40 @@
 namespace orxonox
 {
+    RegisterAbstractClass(PickupListener).inheritsFrom<OrxonoxInterface>();
 
     /**

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

@@ -67 +67 @@
     ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false);
 
+    RegisterAbstractClass(InGameConsole).inheritsFrom<WindowEventListener>();
+
     /**
         @brief Constructor: Creates and initializes the InGameConsole.

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

@@ -36 +36 @@
 namespace orxonox
 {
+    RegisterAbstractClass(AmbientSound).inheritsFrom<BaseSound>().inheritsFrom<MoodListener>();
+
     AmbientSound::AmbientSound()
         : bPlayOnLoad_(false)

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

@@ -66 +66 @@
     }
 
+    RegisterAbstractClass(SoundManager).inheritsFrom<Configurable>();
+
     SoundManager::SoundManager()
         : effectsPoolSize_(0)