[Orxonox-commit 4988] r9657 - in code/branches/core6/src: modules/docking modules/overlays/hud modules/pickup modules/weapons/projectiles orxonox/chat orxonox/sound
landauf at orxonox.net
landauf at orxonox.net
Fri Aug 16 23:28:35 CEST 2013
Author: landauf
Date: 2013-08-16 23:28:34 +0200 (Fri, 16 Aug 2013)
New Revision: 9657
Modified:
code/branches/core6/src/modules/docking/DockingAnimation.cc
code/branches/core6/src/modules/overlays/hud/HUDBar.cc
code/branches/core6/src/modules/pickup/CollectiblePickup.cc
code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc
code/branches/core6/src/orxonox/chat/ChatManager.cc
code/branches/core6/src/orxonox/sound/BaseSound.cc
Log:
found some more classes that need to be registered in the framework
Modified: code/branches/core6/src/modules/docking/DockingAnimation.cc
===================================================================
--- code/branches/core6/src/modules/docking/DockingAnimation.cc 2013-08-16 21:21:48 UTC (rev 9656)
+++ code/branches/core6/src/modules/docking/DockingAnimation.cc 2013-08-16 21:28:34 UTC (rev 9657)
@@ -38,6 +38,8 @@
namespace orxonox
{
+ RegisterAbstractClass(DockingAnimation).inheritsFrom(Class(BaseObject));
+
DockingAnimation::DockingAnimation(Context* context) : BaseObject(context)
{
RegisterObject(DockingAnimation);
Modified: code/branches/core6/src/modules/overlays/hud/HUDBar.cc
===================================================================
--- code/branches/core6/src/modules/overlays/hud/HUDBar.cc 2013-08-16 21:21:48 UTC (rev 9656)
+++ code/branches/core6/src/modules/overlays/hud/HUDBar.cc 2013-08-16 21:28:34 UTC (rev 9657)
@@ -66,6 +66,8 @@
unsigned int HUDBar::materialcount_s = 0;
+ RegisterClass(HUDBar);
+
HUDBar::HUDBar(Context* context)
: OrxonoxOverlay(context), right2Left_(false), autoColour_(false)
{
Modified: code/branches/core6/src/modules/pickup/CollectiblePickup.cc
===================================================================
--- code/branches/core6/src/modules/pickup/CollectiblePickup.cc 2013-08-16 21:21:48 UTC (rev 9656)
+++ code/branches/core6/src/modules/pickup/CollectiblePickup.cc 2013-08-16 21:28:34 UTC (rev 9657)
@@ -37,7 +37,9 @@
#include "PickupCollection.h"
-namespace orxonox {
+namespace orxonox
+{
+ RegisterAbstractClass(CollectiblePickup).inheritsFrom(Class(Pickupable));
/**
@brief
Modified: code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc
===================================================================
--- code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc 2013-08-16 21:21:48 UTC (rev 9656)
+++ code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc 2013-08-16 21:28:34 UTC (rev 9657)
@@ -41,6 +41,8 @@
namespace orxonox
{
+ RegisterClassNoArgs(BasicProjectile);
+
/**
@brief
Constructor. Registers the object and initializes some default values.
Modified: code/branches/core6/src/orxonox/chat/ChatManager.cc
===================================================================
--- code/branches/core6/src/orxonox/chat/ChatManager.cc 2013-08-16 21:21:48 UTC (rev 9656)
+++ code/branches/core6/src/orxonox/chat/ChatManager.cc 2013-08-16 21:28:34 UTC (rev 9657)
@@ -112,6 +112,7 @@
//////////////////////////////////////////////////////////////////////////
// ChatListener //
//////////////////////////////////////////////////////////////////////////
+ RegisterAbstractClass(ChatListener).inheritsFrom(Class(Listable));
ChatListener::ChatListener()
{
Modified: code/branches/core6/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/branches/core6/src/orxonox/sound/BaseSound.cc 2013-08-16 21:21:48 UTC (rev 9656)
+++ code/branches/core6/src/orxonox/sound/BaseSound.cc 2013-08-16 21:28:34 UTC (rev 9657)
@@ -42,6 +42,8 @@
namespace orxonox
{
+ RegisterAbstractClass(BaseSound).inheritsFrom(Class(Listable));
+
BaseSound::BaseSound()
: bPooling_(false)
, volume_(1.0)
More information about the Orxonox-commit
mailing list