Changeset 9656

Timestamp:

Aug 16, 2013, 11:21:48 PM (11 years ago)

Author:

landauf

Message:

register interfaces in framework

Location:

code/branches/core6/src

Files:

• libraries/core/Core.cc (modified) (1 diff)
• libraries/core/ViewportEventListener.cc (modified) (1 diff)
• libraries/core/WindowEventListener.cc (modified) (1 diff)
• libraries/core/XMLNameListener.cc (modified) (1 diff)
• libraries/network/ClientConnectionListener.cc (modified) (1 diff)
• libraries/network/synchronisable/Synchronisable.cc (modified) (1 diff)
• libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) (2 diffs)
• orxonox/interfaces/InterfaceCompilation.cc (modified) (5 diffs)
• orxonox/interfaces/PickupCarrier.cc (modified) (1 diff)
• orxonox/interfaces/Pickupable.cc (modified) (1 diff)
• orxonox/interfaces/RadarViewable.cc (modified) (1 diff)

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

@@ -509 +509 @@
 
 
+    RegisterAbstractClass(DevModeListener).inheritsFrom(Class(Listable));
+
     DevModeListener::DevModeListener()
     {

code/branches/core6/src/libraries/core/ViewportEventListener.cc

@@ -32 +32 @@
 namespace orxonox
 {
+    RegisterAbstractClass(ViewportEventListener).inheritsFrom(Class(Listable));
+
     ViewportEventListener::ViewportEventListener()
     {

code/branches/core6/src/libraries/core/WindowEventListener.cc

@@ -35 +35 @@
     unsigned int WindowEventListener::windowHeight_s = 0;
 
+    RegisterAbstractClass(WindowEventListener).inheritsFrom(Class(Listable));
+
     WindowEventListener::WindowEventListener()
     {

code/branches/core6/src/libraries/core/XMLNameListener.cc

@@ -32 +32 @@
 namespace orxonox
 {
+    RegisterAbstractClass(XMLNameListener).inheritsFrom(Class(Listable));
+
     XMLNameListener::XMLNameListener()
     {

code/branches/core6/src/libraries/network/ClientConnectionListener.cc

@@ -35 +35 @@
 namespace orxonox
 {
+    RegisterAbstractClass(ClientConnectionListener).inheritsFrom(Class(Listable));
+
     ClientConnectionListener::ClientConnectionListener()
     {

code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc

@@ -44 +44 @@
 
   uint8_t Synchronisable::state_=0x1; // detemines wheter we are server (default) or client
+
+  RegisterAbstractClass(Synchronisable).inheritsFrom(Class(OrxonoxInterface));
 
   /**

code/branches/core6/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc

@@ -46 +46 @@
     float TimeFactorListener::timefactor_s = 1.0f;
 
+    RegisterAbstractClass(TimeFactorListener).inheritsFrom(Class(Listable));
+
     TimeFactorListener::TimeFactorListener()
     {
@@ -65 +67 @@
     // Tickable
     //----------------------------
+    RegisterAbstractClass(Tickable).inheritsFrom(Class(OrxonoxInterface));
+
     /**
         @brief Constructor: Registers the object in the Tickable-list

code/branches/core6/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -50 +50 @@
     // GametypeMessageListener
     //----------------------------
+    RegisterAbstractClass(GametypeMessageListener).inheritsFrom(Class(OrxonoxInterface));
+
     GametypeMessageListener::GametypeMessageListener()
     {
@@ -58 +60 @@
     // PlayerTrigger
     //----------------------------
+    RegisterAbstractClass(PlayerTrigger).inheritsFrom(Class(OrxonoxInterface));
+
     PlayerTrigger::PlayerTrigger()
     {
@@ -76 +80 @@
     // RadarListener
     //----------------------------
+    RegisterAbstractClass(RadarListener).inheritsFrom(Class(OrxonoxInterface));
+
     RadarListener::RadarListener()
     {
@@ -84 +90 @@
     // TeamColourable
     //----------------------------
+    RegisterAbstractClass(TeamColourable).inheritsFrom(Class(OrxonoxInterface));
+
     TeamColourable::TeamColourable()
     {
@@ -92 +100 @@
     // Rewardable
     //----------------------------
+    RegisterAbstractClass(Rewardable).inheritsFrom(Class(OrxonoxInterface));
+
     Rewardable::Rewardable()
     {

code/branches/core6/src/orxonox/interfaces/PickupCarrier.cc

@@ -39 +39 @@
 #include "Pickupable.h"
 
-namespace orxonox {
+namespace orxonox
+{
+    RegisterAbstractClass(PickupCarrier).inheritsFrom(Class(OrxonoxInterface));
 
     /**

code/branches/core6/src/orxonox/interfaces/Pickupable.cc

@@ -46 +46 @@
 namespace orxonox
 {
+    RegisterAbstractClass(Pickupable).inheritsFrom(Class(OrxonoxInterface)).inheritsFrom(Class(Rewardable));
 
     /**

code/branches/core6/src/orxonox/interfaces/RadarViewable.cc

@@ -38 +38 @@
 namespace orxonox
 {
+    RegisterAbstractClass(RadarViewable).inheritsFrom(Class(OrxonoxInterface));
+
     /**
         @brief Constructor.