[Orxonox-commit 4990] r9659 - in code/branches/core6: src/libraries/core src/libraries/core/command src/libraries/core/input src/libraries/network src/libraries/network/synchronisable src/libraries/tools src/libraries/tools/interfaces src/modules/designtools src/modules/notifications src/modules/weapons/projectiles src/orxonox src/orxonox/chat src/orxonox/gamestates src/orxonox/interfaces src/orxonox/sound test/core/class test/core/object
landauf at orxonox.net
landauf at orxonox.net
Sun Aug 18 16:57:51 CEST 2013
Author: landauf
Date: 2013-08-18 16:57:51 +0200 (Sun, 18 Aug 2013)
New Revision: 9659
Modified:
code/branches/core6/src/libraries/core/BaseObject.cc
code/branches/core6/src/libraries/core/Core.cc
code/branches/core6/src/libraries/core/CoreIncludes.h
code/branches/core6/src/libraries/core/GUIManager.cc
code/branches/core6/src/libraries/core/Game.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/core/command/Shell.cc
code/branches/core6/src/libraries/core/input/InputBuffer.cc
code/branches/core6/src/libraries/core/input/InputManager.cc
code/branches/core6/src/libraries/core/input/JoyStick.cc
code/branches/core6/src/libraries/core/input/KeyBinder.cc
code/branches/core6/src/libraries/core/input/Mouse.cc
code/branches/core6/src/libraries/network/ClientConnectionListener.cc
code/branches/core6/src/libraries/network/Host.cc
code/branches/core6/src/libraries/network/NetworkFunction.cc
code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc
code/branches/core6/src/libraries/tools/Timer.cc
code/branches/core6/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc
code/branches/core6/src/modules/designtools/ScreenshotManager.cc
code/branches/core6/src/modules/designtools/SkyboxGenerator.cc
code/branches/core6/src/modules/notifications/NotificationManager.cc
code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc
code/branches/core6/src/orxonox/LevelManager.cc
code/branches/core6/src/orxonox/MoodManager.cc
code/branches/core6/src/orxonox/PawnManager.cc
code/branches/core6/src/orxonox/PlayerManager.cc
code/branches/core6/src/orxonox/chat/ChatManager.cc
code/branches/core6/src/orxonox/gamestates/GSMainMenu.cc
code/branches/core6/src/orxonox/interfaces/InterfaceCompilation.cc
code/branches/core6/src/orxonox/interfaces/NotificationListener.cc
code/branches/core6/src/orxonox/interfaces/PickupCarrier.cc
code/branches/core6/src/orxonox/interfaces/PickupListener.cc
code/branches/core6/src/orxonox/interfaces/Pickupable.cc
code/branches/core6/src/orxonox/interfaces/RadarViewable.cc
code/branches/core6/src/orxonox/sound/BaseSound.cc
code/branches/core6/src/orxonox/sound/SoundManager.cc
code/branches/core6/test/core/class/IdentifiableTest.cc
code/branches/core6/test/core/class/IdentifierClassHierarchyTest.cc
code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc
code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc
code/branches/core6/test/core/class/IdentifierTest.cc
code/branches/core6/test/core/class/SubclassIdentifierTest.cc
code/branches/core6/test/core/class/SuperTest.cc
code/branches/core6/test/core/object/ContextTest.cc
code/branches/core6/test/core/object/IteratorTest.cc
code/branches/core6/test/core/object/ListableTest.cc
code/branches/core6/test/core/object/ObjectListIteratorTest.cc
Log:
removed RegisterRootObject (replaced by RegisterObject)
Modified: code/branches/core6/src/libraries/core/BaseObject.cc
===================================================================
--- code/branches/core6/src/libraries/core/BaseObject.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/BaseObject.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -56,7 +56,7 @@
*/
BaseObject::BaseObject(Context* context) : bInitialized_(false)
{
- RegisterRootObject(BaseObject);
+ RegisterObject(BaseObject);
this->bInitialized_ = true;
Modified: code/branches/core6/src/libraries/core/Core.cc
===================================================================
--- code/branches/core6/src/libraries/core/Core.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/Core.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -178,7 +178,7 @@
// Do this soon after the ConfigFileManager has been created to open up the
// possibility to configure everything below here
- RegisterRootObject(Core);
+ RegisterObject(Core);
orxout(internal_info) << "configuring Core" << endl;
this->setConfigValues();
@@ -515,6 +515,6 @@
DevModeListener::DevModeListener()
{
- RegisterRootObject(DevModeListener);
+ RegisterObject(DevModeListener);
}
}
Modified: code/branches/core6/src/libraries/core/CoreIncludes.h
===================================================================
--- code/branches/core6/src/libraries/core/CoreIncludes.h 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/CoreIncludes.h 2013-08-18 14:57:51 UTC (rev 9659)
@@ -36,13 +36,16 @@
@ingroup Object Factory Class Identifier
@brief Defines several very important macros used to register objects, register classes, and to work with identifiers.
- Every class needs the @c RegisterObject(class) macro in its constructor. If the class is an interface
- or the @c BaseObject itself, it needs the macro @c RegisterRootObject(class) instead.
+ Every class needs the @c RegisterObject(class) macro in its constructor.
To register @a class in the class-hierarchy, use the @c RegisterClass(class) macro outside of the class implementation,
so it gets executed statically before @c main(). If you don't want @a class to be loadable, but still register it, call
@c RegisterUnloadableClass(class).
+ Abstract classes are registered with @c RegisterAbstractClass(class). For abstract classes, the inheritance must be
+ defined manually with @c RegisterAbstractClass(class).inheritsFrom(Class(parent)). Multiple parent classes can be defined
+ by chaining the above command.
+
Example:
@code
// register MyClass
@@ -124,34 +127,16 @@
Identifier& _##ClassName##Identifier = orxonox::registerClass<ClassName>(#ClassName, FactoryInstance, bLoadable)
/**
- @brief Intern macro, containing the common parts of @c RegisterObject and @c RegisterRootObject.
+ @brief Registers a newly created object in the framework. Has to be called at the beginning of the constructor of @a ClassName.
@param ClassName The name of the class
- @param bRootClass True if the class is directly derived from orxonox::OrxonoxClass
*/
-#define InternRegisterObject(ClassName) \
+#define RegisterObject(ClassName) \
if (ClassIdentifier<ClassName>::getIdentifier(#ClassName)->initializeObject(this)) \
return; \
else \
((void)0)
/**
- @brief Registers a newly created object in the framework. Has to be called at the beginning of the constructor of @a ClassName.
- @param ClassName The name of the class
-*/
-#define RegisterObject(ClassName) \
- InternRegisterObject(ClassName)
-
-/**
- @brief Registers a newly created object in the framework. Has to be called at the beginning of the constructor of @a ClassName.
- @param ClassName The name of the class
-
- In contrast to RegisterObject, this is used for classes that inherit directly from
- orxonox::OrxonoxClass, namely all interfaces and orxonox::BaseObject.
-*/
-#define RegisterRootObject(ClassName) \
- InternRegisterObject(ClassName)
-
-/**
@brief Returns the Identifier of the given class.
@param ClassName The name of the class
*/
Modified: code/branches/core6/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/core6/src/libraries/core/GUIManager.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/GUIManager.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -255,7 +255,7 @@
, camera_(NULL)
, destructionHelper_(this)
{
- RegisterRootObject(GUIManager);
+ RegisterObject(GUIManager);
orxout(internal_status) << "initializing GUIManager..." << endl;
Modified: code/branches/core6/src/libraries/core/Game.cc
===================================================================
--- code/branches/core6/src/libraries/core/Game.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/Game.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -111,7 +111,7 @@
this->core_ = new Core(cmdLine);
// Do this after the Core creation!
- RegisterRootObject(Game);
+ RegisterObject(Game);
this->setConfigValues();
// After the core has been created, we can safely instantiate the GameStates that don't require graphics
Modified: code/branches/core6/src/libraries/core/ViewportEventListener.cc
===================================================================
--- code/branches/core6/src/libraries/core/ViewportEventListener.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/ViewportEventListener.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -35,6 +35,6 @@
ViewportEventListener::ViewportEventListener()
{
- RegisterRootObject(ViewportEventListener);
+ RegisterObject(ViewportEventListener);
}
}
Modified: code/branches/core6/src/libraries/core/WindowEventListener.cc
===================================================================
--- code/branches/core6/src/libraries/core/WindowEventListener.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/WindowEventListener.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -38,7 +38,7 @@
WindowEventListener::WindowEventListener()
{
- RegisterRootObject(WindowEventListener);
+ RegisterObject(WindowEventListener);
}
//! Calls all registered objects
Modified: code/branches/core6/src/libraries/core/XMLNameListener.cc
===================================================================
--- code/branches/core6/src/libraries/core/XMLNameListener.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/XMLNameListener.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -35,6 +35,6 @@
XMLNameListener::XMLNameListener()
{
- RegisterRootObject(XMLNameListener);
+ RegisterObject(XMLNameListener);
}
}
Modified: code/branches/core6/src/libraries/core/command/Shell.cc
===================================================================
--- code/branches/core6/src/libraries/core/command/Shell.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/command/Shell.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -67,7 +67,7 @@
, inputBuffer_(new InputBuffer())
, bScrollable_(bScrollable)
{
- RegisterRootObject(Shell);
+ RegisterObject(Shell);
OutputManager::getInstance().registerListener(this);
Modified: code/branches/core6/src/libraries/core/input/InputBuffer.cc
===================================================================
--- code/branches/core6/src/libraries/core/input/InputBuffer.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/input/InputBuffer.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -38,7 +38,7 @@
InputBuffer::InputBuffer()
{
- RegisterRootObject(InputBuffer);
+ RegisterObject(InputBuffer);
this->cursor_ = 0;
this->maxLength_ = 1024;
@@ -58,7 +58,7 @@
InputBuffer::InputBuffer(const std::string& allowedChars)
{
- RegisterRootObject(InputBuffer);
+ RegisterObject(InputBuffer);
this->maxLength_ = 1024;
this->allowedChars_ = allowedChars;
Modified: code/branches/core6/src/libraries/core/input/InputManager.cc
===================================================================
--- code/branches/core6/src/libraries/core/input/InputManager.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/input/InputManager.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -97,7 +97,7 @@
, emptyState_(0)
, calibratorCallbackHandler_(0)
{
- RegisterRootObject(InputManager);
+ RegisterObject(InputManager);
orxout(internal_status, context::input) << "InputManager: Constructing..." << endl;
Modified: code/branches/core6/src/libraries/core/input/JoyStick.cc
===================================================================
--- code/branches/core6/src/libraries/core/input/JoyStick.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/input/JoyStick.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -50,7 +50,7 @@
JoyStick::JoyStick(unsigned int id, OIS::InputManager* oisInputManager)
: super(id, oisInputManager)
{
- RegisterRootObject(JoyStick);
+ RegisterObject(JoyStick);
this->setConfigValues();
// Initialise POV and Slider states
this->clearBuffersImpl();
Modified: code/branches/core6/src/libraries/core/input/KeyBinder.cc
===================================================================
--- code/branches/core6/src/libraries/core/input/KeyBinder.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/input/KeyBinder.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -57,7 +57,7 @@
mousePosition_[0] = 0.0;
mousePosition_[1] = 0.0;
- RegisterRootObject(KeyBinder);
+ RegisterObject(KeyBinder);
// initialise all buttons and half axes to avoid creating everything with 'new'
// keys
Modified: code/branches/core6/src/libraries/core/input/Mouse.cc
===================================================================
--- code/branches/core6/src/libraries/core/input/Mouse.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/core/input/Mouse.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -53,7 +53,7 @@
Mouse::Mouse(unsigned int id, OIS::InputManager* oisInputManager)
: super(id, oisInputManager)
{
- RegisterRootObject(Mouse);
+ RegisterObject(Mouse);
this->windowResized(this->getWindowWidth(), this->getWindowHeight());
#ifdef ORXONOX_PLATFORM_LINUX
Modified: code/branches/core6/src/libraries/network/ClientConnectionListener.cc
===================================================================
--- code/branches/core6/src/libraries/network/ClientConnectionListener.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/network/ClientConnectionListener.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -38,7 +38,7 @@
ClientConnectionListener::ClientConnectionListener()
{
- RegisterRootObject(ClientConnectionListener);
+ RegisterObject(ClientConnectionListener);
}
void ClientConnectionListener::broadcastClientConnected(unsigned int clientID)
Modified: code/branches/core6/src/libraries/network/Host.cc
===================================================================
--- code/branches/core6/src/libraries/network/Host.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/network/Host.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -144,7 +144,7 @@
NetworkChatListener::NetworkChatListener()
{
- RegisterRootObject(NetworkChatListener);
+ RegisterObject(NetworkChatListener);
}
}//namespace orxonox
Modified: code/branches/core6/src/libraries/network/NetworkFunction.cc
===================================================================
--- code/branches/core6/src/libraries/network/NetworkFunction.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/network/NetworkFunction.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -43,7 +43,7 @@
NetworkFunctionBase::NetworkFunctionBase(const std::string& name)
{
- RegisterRootObject(NetworkFunctionBase);
+ RegisterObject(NetworkFunctionBase);
static uint32_t networkID = 0;
this->networkID_ = networkID++;
Modified: code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc
===================================================================
--- code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/network/synchronisable/Synchronisable.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -52,7 +52,7 @@
*/
Synchronisable::Synchronisable(Context* context)
{
- RegisterRootObject(Synchronisable);
+ RegisterObject(Synchronisable);
static uint32_t idCounter=0;
objectMode_=0x1; // by default do not send data to server
if ( GameMode::isMaster()/* || ( Host::running() && Host::isServer() )*/ )
Modified: code/branches/core6/src/libraries/tools/Timer.cc
===================================================================
--- code/branches/core6/src/libraries/tools/Timer.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/tools/Timer.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -139,7 +139,7 @@
Timer::Timer()
{
this->init();
- RegisterRootObject(Timer);
+ RegisterObject(Timer);
}
/**
@@ -152,7 +152,7 @@
Timer::Timer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall)
{
this->init();
- RegisterRootObject(Timer);
+ RegisterObject(Timer);
this->setTimer(interval, bLoop, executor, bKillAfterCall);
}
Modified: code/branches/core6/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc
===================================================================
--- code/branches/core6/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -49,7 +49,7 @@
TimeFactorListener::TimeFactorListener()
{
- RegisterRootObject(TimeFactorListener);
+ RegisterObject(TimeFactorListener);
}
/*static*/ void TimeFactorListener::setTimeFactor(float factor)
@@ -73,6 +73,6 @@
*/
Tickable::Tickable()
{
- RegisterRootObject(Tickable);
+ RegisterObject(Tickable);
}
}
Modified: code/branches/core6/src/modules/designtools/ScreenshotManager.cc
===================================================================
--- code/branches/core6/src/modules/designtools/ScreenshotManager.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/modules/designtools/ScreenshotManager.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -68,7 +68,7 @@
*/
ScreenshotManager::ScreenshotManager() : finalPicturePB_(NULL), data_(NULL)
{
- RegisterRootObject(ScreenshotManager);
+ RegisterObject(ScreenshotManager);
this->setConfigValues();
Modified: code/branches/core6/src/modules/designtools/SkyboxGenerator.cc
===================================================================
--- code/branches/core6/src/modules/designtools/SkyboxGenerator.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/modules/designtools/SkyboxGenerator.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -67,7 +67,7 @@
*/
SkyboxGenerator::SkyboxGenerator()
{
- RegisterRootObject(SkyboxGenerator);
+ RegisterObject(SkyboxGenerator);
this->setConfigValues();
Modified: code/branches/core6/src/modules/notifications/NotificationManager.cc
===================================================================
--- code/branches/core6/src/modules/notifications/NotificationManager.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/modules/notifications/NotificationManager.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -54,7 +54,7 @@
*/
NotificationManager::NotificationManager()
{
- RegisterRootObject(NotificationManager);
+ RegisterObject(NotificationManager);
orxout(internal_info, context::notifications) << "NotificatioManager created." << endl;
}
Modified: code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc
===================================================================
--- code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -49,7 +49,7 @@
*/
BasicProjectile::BasicProjectile()
{
- RegisterRootObject(BasicProjectile);// Register the BasicProjectile class to the core
+ RegisterObject(BasicProjectile);// Register the BasicProjectile class to the core
this->bDestroy_ = false;
Modified: code/branches/core6/src/orxonox/LevelManager.cc
===================================================================
--- code/branches/core6/src/orxonox/LevelManager.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/LevelManager.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -58,7 +58,7 @@
*/
LevelManager::LevelManager()
{
- RegisterRootObject(LevelManager);
+ RegisterObject(LevelManager);
this->setConfigValues();
// check override
Modified: code/branches/core6/src/orxonox/MoodManager.cc
===================================================================
--- code/branches/core6/src/orxonox/MoodManager.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/MoodManager.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -42,7 +42,7 @@
MoodManager::MoodManager()
{
- RegisterRootObject(MoodManager);
+ RegisterObject(MoodManager);
this->setConfigValues();
// Need to use a variable to store old data because ResetConfigValues() doesn't seem to work.
@@ -94,7 +94,7 @@
MoodListener::MoodListener()
{
- RegisterRootObject(MoodListener);
+ RegisterObject(MoodListener);
}
/*static*/ void MoodListener::changedMood(const std::string& mood)
Modified: code/branches/core6/src/orxonox/PawnManager.cc
===================================================================
--- code/branches/core6/src/orxonox/PawnManager.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/PawnManager.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -38,7 +38,7 @@
PawnManager::PawnManager()
{
- RegisterRootObject(PawnManager);
+ RegisterObject(PawnManager);
}
PawnManager::~PawnManager()
Modified: code/branches/core6/src/orxonox/PlayerManager.cc
===================================================================
--- code/branches/core6/src/orxonox/PlayerManager.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/PlayerManager.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -42,7 +42,7 @@
PlayerManager::PlayerManager()
{
- RegisterRootObject(PlayerManager);
+ RegisterObject(PlayerManager);
// this->getConnectedClients();
}
Modified: code/branches/core6/src/orxonox/chat/ChatManager.cc
===================================================================
--- code/branches/core6/src/orxonox/chat/ChatManager.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/chat/ChatManager.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -116,6 +116,6 @@
ChatListener::ChatListener()
{
- RegisterRootObject(ChatListener);
+ RegisterObject(ChatListener);
}
}
Modified: code/branches/core6/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/core6/src/orxonox/gamestates/GSMainMenu.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/gamestates/GSMainMenu.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -65,7 +65,7 @@
GSMainMenu::GSMainMenu(const GameStateInfo& info)
: GameState(info)
{
- RegisterRootObject(GSMainMenu);
+ RegisterObject(GSMainMenu);
InputManager::getInstance().createInputState("MainMenuHackery", true, true)->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
Modified: code/branches/core6/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- code/branches/core6/src/orxonox/interfaces/InterfaceCompilation.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/interfaces/InterfaceCompilation.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -53,7 +53,7 @@
GametypeMessageListener::GametypeMessageListener()
{
- RegisterRootObject(GametypeMessageListener);
+ RegisterObject(GametypeMessageListener);
}
//----------------------------
@@ -63,7 +63,7 @@
PlayerTrigger::PlayerTrigger()
{
- RegisterRootObject(PlayerTrigger);
+ RegisterObject(PlayerTrigger);
this->isForPlayer_ = false;
}
@@ -83,7 +83,7 @@
RadarListener::RadarListener()
{
- RegisterRootObject(RadarListener);
+ RegisterObject(RadarListener);
}
//----------------------------
@@ -93,7 +93,7 @@
TeamColourable::TeamColourable()
{
- RegisterRootObject(TeamColourable);
+ RegisterObject(TeamColourable);
}
//----------------------------
@@ -103,6 +103,6 @@
Rewardable::Rewardable()
{
- RegisterRootObject(Rewardable);
+ RegisterObject(Rewardable);
}
}
Modified: code/branches/core6/src/orxonox/interfaces/NotificationListener.cc
===================================================================
--- code/branches/core6/src/orxonox/interfaces/NotificationListener.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/interfaces/NotificationListener.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -52,7 +52,7 @@
NotificationListener::NotificationListener()
{
- RegisterRootObject(NotificationListener);
+ RegisterObject(NotificationListener);
}
/**
@@ -158,4 +158,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: code/branches/core6/src/orxonox/interfaces/PickupCarrier.cc
===================================================================
--- code/branches/core6/src/orxonox/interfaces/PickupCarrier.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/interfaces/PickupCarrier.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -48,7 +48,7 @@
*/
PickupCarrier::PickupCarrier()
{
- RegisterRootObject(PickupCarrier);
+ RegisterObject(PickupCarrier);
}
/**
Modified: code/branches/core6/src/orxonox/interfaces/PickupListener.cc
===================================================================
--- code/branches/core6/src/orxonox/interfaces/PickupListener.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/interfaces/PickupListener.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -46,7 +46,7 @@
*/
PickupListener::PickupListener()
{
- RegisterRootObject(PickupListener);
+ RegisterObject(PickupListener);
}
/**
Modified: code/branches/core6/src/orxonox/interfaces/Pickupable.cc
===================================================================
--- code/branches/core6/src/orxonox/interfaces/Pickupable.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/interfaces/Pickupable.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -53,7 +53,7 @@
*/
Pickupable::Pickupable() : used_(false), pickedUp_(false)
{
- RegisterRootObject(Pickupable);
+ RegisterObject(Pickupable);
this->carrier_ = NULL;
Modified: code/branches/core6/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- code/branches/core6/src/orxonox/interfaces/RadarViewable.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/interfaces/RadarViewable.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -52,7 +52,7 @@
, radarObjectDescription_("staticObject")
, scale_(1.0f)
{
- RegisterRootObject(RadarViewable);
+ RegisterObject(RadarViewable);
this->uniqueId_=getUniqueNumberString();
if( GameMode::showsGraphics() )
Modified: code/branches/core6/src/orxonox/sound/BaseSound.cc
===================================================================
--- code/branches/core6/src/orxonox/sound/BaseSound.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/sound/BaseSound.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -51,7 +51,7 @@
, state_(Stopped)
, pitch_ (1.0)
{
- RegisterRootObject(BaseSound);
+ RegisterObject(BaseSound);
// Initialise audioSource_ to a value that is not a source
// 0 is unfortunately not guaranteed to be no source ID.
Modified: code/branches/core6/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/core6/src/orxonox/sound/SoundManager.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/src/orxonox/sound/SoundManager.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -68,7 +68,7 @@
SoundManager::SoundManager()
: effectsPoolSize_(0)
{
- RegisterRootObject(SoundManager);
+ RegisterObject(SoundManager);
orxout(user_status) << "Loading sound" << endl;
Modified: code/branches/core6/test/core/class/IdentifiableTest.cc
===================================================================
--- code/branches/core6/test/core/class/IdentifiableTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/class/IdentifiableTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -9,7 +9,7 @@
class IdentifiableTest : public Identifiable
{
public:
- IdentifiableTest() { RegisterRootObject(IdentifiableTest); }
+ IdentifiableTest() { RegisterObject(IdentifiableTest); }
};
}
Modified: code/branches/core6/test/core/class/IdentifierClassHierarchyTest.cc
===================================================================
--- code/branches/core6/test/core/class/IdentifierClassHierarchyTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/class/IdentifierClassHierarchyTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -23,7 +23,7 @@
public:
BaseInterface1()
{
- RegisterRootObject(BaseInterface1);
+ RegisterObject(BaseInterface1);
}
virtual void test1() = 0;
@@ -34,7 +34,7 @@
public:
BaseInterface2()
{
- RegisterRootObject(BaseInterface2);
+ RegisterObject(BaseInterface2);
}
virtual void test2() = 0;
@@ -63,7 +63,7 @@
public:
BaseClass()
{
- RegisterRootObject(BaseClass);
+ RegisterObject(BaseClass);
}
};
Modified: code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc
===================================================================
--- code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -11,7 +11,7 @@
public:
Interface()
{
- RegisterRootObject(Interface);
+ RegisterObject(Interface);
}
virtual void test() = 0;
@@ -22,7 +22,7 @@
public:
BaseClass()
{
- RegisterRootObject(BaseClass);
+ RegisterObject(BaseClass);
}
};
Modified: code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc
===================================================================
--- code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -13,7 +13,7 @@
public:
Interface()
{
- RegisterRootObject(Interface);
+ RegisterObject(Interface);
}
virtual void test() = 0;
@@ -24,7 +24,7 @@
public:
BaseClass()
{
- RegisterRootObject(BaseClass);
+ RegisterObject(BaseClass);
}
};
Modified: code/branches/core6/test/core/class/IdentifierTest.cc
===================================================================
--- code/branches/core6/test/core/class/IdentifierTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/class/IdentifierTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -9,7 +9,7 @@
class TestClass : public Identifiable
{
public:
- TestClass() { RegisterRootObject(TestClass); }
+ TestClass() { RegisterObject(TestClass); }
};
class TestSubclass : public TestClass
Modified: code/branches/core6/test/core/class/SubclassIdentifierTest.cc
===================================================================
--- code/branches/core6/test/core/class/SubclassIdentifierTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/class/SubclassIdentifierTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -11,7 +11,7 @@
class TestClass : public OrxonoxClass
{
public:
- TestClass(Context* context = NULL) { RegisterRootObject(TestClass); }
+ TestClass(Context* context = NULL) { RegisterObject(TestClass); }
};
class TestSubclass : public TestClass
Modified: code/branches/core6/test/core/class/SuperTest.cc
===================================================================
--- code/branches/core6/test/core/class/SuperTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/class/SuperTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -14,7 +14,7 @@
public:
TestClass(Context* context = NULL) : BaseObject(context), changedNameBase_(false), xmlPortBase_(false), modeBase_(XMLPort::NOP)
{
- RegisterRootObject(TestClass);
+ RegisterObject(TestClass);
}
virtual void changedName()
Modified: code/branches/core6/test/core/object/ContextTest.cc
===================================================================
--- code/branches/core6/test/core/object/ContextTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/object/ContextTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -10,7 +10,7 @@
class SubclassContext : public OrxonoxClass, public Context
{
public:
- SubclassContext() : Context(NULL) { RegisterRootObject(SubclassContext); }
+ SubclassContext() : Context(NULL) { RegisterObject(SubclassContext); }
};
// Fixture
Modified: code/branches/core6/test/core/object/IteratorTest.cc
===================================================================
--- code/branches/core6/test/core/object/IteratorTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/object/IteratorTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -13,13 +13,13 @@
class TestInterface : virtual public OrxonoxInterface
{
public:
- TestInterface() { RegisterRootObject(TestInterface); }
+ TestInterface() { RegisterObject(TestInterface); }
};
class TestClass : public OrxonoxClass, public TestInterface
{
public:
- TestClass() { RegisterRootObject(TestClass); }
+ TestClass() { RegisterObject(TestClass); }
MOCK_METHOD0(test, void());
};
Modified: code/branches/core6/test/core/object/ListableTest.cc
===================================================================
--- code/branches/core6/test/core/object/ListableTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/object/ListableTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -9,7 +9,7 @@
class ListableClassTest : public Listable
{
public:
- ListableClassTest() { RegisterRootObject(ListableClassTest); }
+ ListableClassTest() { RegisterObject(ListableClassTest); }
};
class ListableSubclassTest : public ListableClassTest
Modified: code/branches/core6/test/core/object/ObjectListIteratorTest.cc
===================================================================
--- code/branches/core6/test/core/object/ObjectListIteratorTest.cc 2013-08-18 14:41:37 UTC (rev 9658)
+++ code/branches/core6/test/core/object/ObjectListIteratorTest.cc 2013-08-18 14:57:51 UTC (rev 9659)
@@ -12,7 +12,7 @@
class ListableTest : public Listable
{
public:
- ListableTest() { RegisterRootObject(ListableTest); }
+ ListableTest() { RegisterObject(ListableTest); }
MOCK_METHOD0(test, void());
};
More information about the Orxonox-commit
mailing list