[Orxonox-commit 4987] r9656 - in code/branches/core6/src: libraries/core libraries/network libraries/network/synchronisable libraries/tools/interfaces orxonox/interfaces
landauf at orxonox.net
landauf at orxonox.net
Fri Aug 16 23:21:48 CEST 2013
Author: landauf
Date: 2013-08-16 23:21:48 +0200 (Fri, 16 Aug 2013)
New Revision: 9656
Modified:
code/branches/core6/src/libraries/core/Core.cc
code/branches/core6/src/libraries/core/ViewportEventListener.cc
code/branches/core6/src/libraries/core/WindowEventListener.cc
code/branches/core6/src/libraries/core/XMLNameListener.cc
code/branches/core6/src/libraries/network/ClientConnectionListener.cc
code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc
code/branches/core6/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc
code/branches/core6/src/orxonox/interfaces/InterfaceCompilation.cc
code/branches/core6/src/orxonox/interfaces/PickupCarrier.cc
code/branches/core6/src/orxonox/interfaces/Pickupable.cc
code/branches/core6/src/orxonox/interfaces/RadarViewable.cc
Log:
register interfaces in framework
Modified: code/branches/core6/src/libraries/core/Core.cc
===================================================================
--- code/branches/core6/src/libraries/core/Core.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/libraries/core/Core.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -508,6 +508,8 @@
}
+ RegisterAbstractClass(DevModeListener).inheritsFrom(Class(Listable));
+
DevModeListener::DevModeListener()
{
RegisterRootObject(DevModeListener);
Modified: code/branches/core6/src/libraries/core/ViewportEventListener.cc
===================================================================
--- code/branches/core6/src/libraries/core/ViewportEventListener.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/libraries/core/ViewportEventListener.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -31,6 +31,8 @@
namespace orxonox
{
+ RegisterAbstractClass(ViewportEventListener).inheritsFrom(Class(Listable));
+
ViewportEventListener::ViewportEventListener()
{
RegisterRootObject(ViewportEventListener);
Modified: code/branches/core6/src/libraries/core/WindowEventListener.cc
===================================================================
--- code/branches/core6/src/libraries/core/WindowEventListener.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/libraries/core/WindowEventListener.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -34,6 +34,8 @@
unsigned int WindowEventListener::windowWidth_s = 0;
unsigned int WindowEventListener::windowHeight_s = 0;
+ RegisterAbstractClass(WindowEventListener).inheritsFrom(Class(Listable));
+
WindowEventListener::WindowEventListener()
{
RegisterRootObject(WindowEventListener);
Modified: code/branches/core6/src/libraries/core/XMLNameListener.cc
===================================================================
--- code/branches/core6/src/libraries/core/XMLNameListener.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/libraries/core/XMLNameListener.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -31,6 +31,8 @@
namespace orxonox
{
+ RegisterAbstractClass(XMLNameListener).inheritsFrom(Class(Listable));
+
XMLNameListener::XMLNameListener()
{
RegisterRootObject(XMLNameListener);
Modified: code/branches/core6/src/libraries/network/ClientConnectionListener.cc
===================================================================
--- code/branches/core6/src/libraries/network/ClientConnectionListener.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/libraries/network/ClientConnectionListener.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -34,6 +34,8 @@
namespace orxonox
{
+ RegisterAbstractClass(ClientConnectionListener).inheritsFrom(Class(Listable));
+
ClientConnectionListener::ClientConnectionListener()
{
RegisterRootObject(ClientConnectionListener);
Modified: code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc
===================================================================
--- code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -44,6 +44,8 @@
uint8_t Synchronisable::state_=0x1; // detemines wheter we are server (default) or client
+ RegisterAbstractClass(Synchronisable).inheritsFrom(Class(OrxonoxInterface));
+
/**
* Constructor:
* Initializes all Variables and sets the right objectID_
Modified: code/branches/core6/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc
===================================================================
--- code/branches/core6/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -45,6 +45,8 @@
//----------------------------
float TimeFactorListener::timefactor_s = 1.0f;
+ RegisterAbstractClass(TimeFactorListener).inheritsFrom(Class(Listable));
+
TimeFactorListener::TimeFactorListener()
{
RegisterRootObject(TimeFactorListener);
@@ -64,6 +66,8 @@
//----------------------------
// Tickable
//----------------------------
+ RegisterAbstractClass(Tickable).inheritsFrom(Class(OrxonoxInterface));
+
/**
@brief Constructor: Registers the object in the Tickable-list
*/
Modified: code/branches/core6/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- code/branches/core6/src/orxonox/interfaces/InterfaceCompilation.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/orxonox/interfaces/InterfaceCompilation.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -49,6 +49,8 @@
//----------------------------
// GametypeMessageListener
//----------------------------
+ RegisterAbstractClass(GametypeMessageListener).inheritsFrom(Class(OrxonoxInterface));
+
GametypeMessageListener::GametypeMessageListener()
{
RegisterRootObject(GametypeMessageListener);
@@ -57,6 +59,8 @@
//----------------------------
// PlayerTrigger
//----------------------------
+ RegisterAbstractClass(PlayerTrigger).inheritsFrom(Class(OrxonoxInterface));
+
PlayerTrigger::PlayerTrigger()
{
RegisterRootObject(PlayerTrigger);
@@ -75,6 +79,8 @@
//----------------------------
// RadarListener
//----------------------------
+ RegisterAbstractClass(RadarListener).inheritsFrom(Class(OrxonoxInterface));
+
RadarListener::RadarListener()
{
RegisterRootObject(RadarListener);
@@ -83,6 +89,8 @@
//----------------------------
// TeamColourable
//----------------------------
+ RegisterAbstractClass(TeamColourable).inheritsFrom(Class(OrxonoxInterface));
+
TeamColourable::TeamColourable()
{
RegisterRootObject(TeamColourable);
@@ -91,6 +99,8 @@
//----------------------------
// Rewardable
//----------------------------
+ RegisterAbstractClass(Rewardable).inheritsFrom(Class(OrxonoxInterface));
+
Rewardable::Rewardable()
{
RegisterRootObject(Rewardable);
Modified: code/branches/core6/src/orxonox/interfaces/PickupCarrier.cc
===================================================================
--- code/branches/core6/src/orxonox/interfaces/PickupCarrier.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/orxonox/interfaces/PickupCarrier.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -38,7 +38,9 @@
#include "Pickupable.h"
-namespace orxonox {
+namespace orxonox
+{
+ RegisterAbstractClass(PickupCarrier).inheritsFrom(Class(OrxonoxInterface));
/**
@brief
Modified: code/branches/core6/src/orxonox/interfaces/Pickupable.cc
===================================================================
--- code/branches/core6/src/orxonox/interfaces/Pickupable.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/orxonox/interfaces/Pickupable.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -45,6 +45,7 @@
namespace orxonox
{
+ RegisterAbstractClass(Pickupable).inheritsFrom(Class(OrxonoxInterface)).inheritsFrom(Class(Rewardable));
/**
@brief
Modified: code/branches/core6/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- code/branches/core6/src/orxonox/interfaces/RadarViewable.cc 2013-08-16 21:08:58 UTC (rev 9655)
+++ code/branches/core6/src/orxonox/interfaces/RadarViewable.cc 2013-08-16 21:21:48 UTC (rev 9656)
@@ -37,6 +37,8 @@
namespace orxonox
{
+ RegisterAbstractClass(RadarViewable).inheritsFrom(Class(OrxonoxInterface));
+
/**
@brief Constructor.
*/
More information about the Orxonox-commit
mailing list