Changeset 10362 for code/branches/core7

Timestamp:

Apr 12, 2015, 11:07:14 PM (10 years ago)

Author:

landauf

Message:

use static identifier initializer to store the inheritance definition of abstract classes. this prevents that identifiers are used (via Class(Name)) before they are properly initialized.

Location:

code/branches/core7/src

Files:

• libraries/core/Core.cc (modified) (2 diffs)
• libraries/core/CoreIncludes.h (modified) (2 diffs)
• 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/NetworkFunction.cc (modified) (1 diff)
• libraries/network/synchronisable/Synchronisable.cc (modified) (1 diff)
• libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) (2 diffs)
• modules/docking/DockingAnimation.cc (modified) (1 diff)
• modules/docking/DockingEffect.cc (modified) (1 diff)
• modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc (modified) (1 diff)
• modules/pickup/CollectiblePickup.cc (modified) (1 diff)
• modules/questsystem/Quest.cc (modified) (1 diff)
• modules/questsystem/QuestEffect.cc (modified) (1 diff)
• modules/questsystem/effects/ChangeQuestStatus.cc (modified) (1 diff)
• orxonox/chat/ChatManager.cc (modified) (1 diff)
• orxonox/collisionshapes/CollisionShape.cc (modified) (1 diff)
• orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• orxonox/infos/PlayerInfo.cc (modified) (1 diff)
• 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)
• orxonox/sound/BaseSound.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)
• orxonox/worldentities/WorldEntity.cc (modified) (1 diff)

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

@@ -94 +94 @@
 
     // register Core as an abstract class to avoid problems if the class hierarchy is created within Core-constructor
-    RegisterAbstractClass(Core).inheritsFrom(Class(Configurable));
+    RegisterAbstractClass(Core).inheritsFrom<Configurable>();
 
     Core::Core(const std::string& cmdLine)
@@ -517 +517 @@
 
 
-    RegisterAbstractClass(DevModeListener).inheritsFrom(Class(Listable));
+    RegisterAbstractClass(DevModeListener).inheritsFrom<Listable>();
 
     DevModeListener::DevModeListener()

code/branches/core7/src/libraries/core/CoreIncludes.h

@@ -127 +127 @@
 */
 #define RegisterClassWithFactory(ClassName, FactoryInstance, bLoadable) \
-    Identifier& _##ClassName##Identifier = (new orxonox::SI_I(orxonox::registerClass<ClassName>(#ClassName, FactoryInstance, bLoadable)))->getIdentifier()
+    orxonox::SI_I& _##ClassName##Identifier = (*new orxonox::SI_I(orxonox::registerClass<ClassName>(#ClassName, FactoryInstance, bLoadable)))
 
 /**
@@ -213 +213 @@
     }
 
+
+
+
+    /**
+     * The static initializer stores the parent classes of this identifier. The corresponding identifiers are later loaded. This prevents identifiers from
+     * being used before they are completely initialized.
+     */
     class _CoreExport StaticallyInitializedIdentifier : public StaticallyInitializedInstance
     {
+        struct InheritsFrom
+        {
+            virtual ~InheritsFrom() {}
+            virtual Identifier* getParent() = 0;
+        };
+
+        template <class T>
+        struct InheritsFromClass : public InheritsFrom
+        {
+            virtual Identifier* getParent() { return Class(T); }
+        };
+
         public:
             StaticallyInitializedIdentifier(Identifier* identifier) : identifier_(identifier) {}
-
-            virtual void load() {}
+            ~StaticallyInitializedIdentifier()
+            {
+                for (size_t i = 0; i < this->parents_.size(); ++i)
+                    delete parents_[i];
+            }
+
+            virtual void load()
+            {
+                for (size_t i = 0; i < this->parents_.size(); ++i)
+                    this->identifier_->inheritsFrom(this->parents_[i]->getParent());
+            }
 
             inline Identifier& getIdentifier()
                 { return *this->identifier_; }
 
+            template <class T>
+            inline StaticallyInitializedIdentifier& inheritsFrom()
+                { this->parents_.push_back(new InheritsFromClass<T>()); return *this; }
+
         private:
             Identifier* identifier_;
+            std::vector<InheritsFrom*> parents_;
     };
 

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

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

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

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

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

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

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

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

code/branches/core7/src/libraries/network/NetworkFunction.cc

@@ -38 +38 @@
 
   // no suitable factory for NetworkFunctionBase (and children), so we declare it abstract
-  RegisterAbstractClass(NetworkFunctionBase).inheritsFrom(Class(Listable));
-  RegisterAbstractClass(NetworkFunctionStatic).inheritsFrom(Class(NetworkFunctionBase));
-  RegisterAbstractClass(NetworkMemberFunctionBase).inheritsFrom(Class(NetworkFunctionBase));
+  RegisterAbstractClass(NetworkFunctionBase).inheritsFrom<Listable>();
+  RegisterAbstractClass(NetworkFunctionStatic).inheritsFrom<NetworkFunctionBase>();
+  RegisterAbstractClass(NetworkMemberFunctionBase).inheritsFrom<NetworkFunctionBase>();
 
   NetworkFunctionBase::NetworkFunctionBase(const std::string& name)

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

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

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

@@ -46 +46 @@
     float TimeFactorListener::timefactor_s = 1.0f;
 
-    RegisterAbstractClass(TimeFactorListener).inheritsFrom(Class(Listable));
+    RegisterAbstractClass(TimeFactorListener).inheritsFrom<Listable>();
 
     TimeFactorListener::TimeFactorListener()
@@ -67 +67 @@
     // Tickable
     //----------------------------
-    RegisterAbstractClass(Tickable).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(Tickable).inheritsFrom<OrxonoxInterface>();
 
     /**

code/branches/core7/src/modules/docking/DockingAnimation.cc

@@ -39 +39 @@
 namespace orxonox
 {
-    RegisterAbstractClass(DockingAnimation).inheritsFrom(Class(BaseObject));
+    RegisterAbstractClass(DockingAnimation).inheritsFrom<BaseObject>();
 
     DockingAnimation::DockingAnimation(Context* context) : BaseObject(context)

code/branches/core7/src/modules/docking/DockingEffect.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    RegisterAbstractClass(DockingEffect).inheritsFrom(Class(BaseObject));
+    RegisterAbstractClass(DockingEffect).inheritsFrom<BaseObject>();
 
     DockingEffect::DockingEffect(Context* context) : BaseObject(context)

code/branches/core7/src/modules/objects/collisionshapes/AbstractRadiusHeightCollisionShape.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    RegisterAbstractClass(AbstractRadiusHeightCollisionShape).inheritsFrom(Class(CollisionShape));
+    RegisterAbstractClass(AbstractRadiusHeightCollisionShape).inheritsFrom<CollisionShape>();
 
     /**

code/branches/core7/src/modules/pickup/CollectiblePickup.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    RegisterAbstractClass(CollectiblePickup).inheritsFrom(Class(Pickupable));
+    RegisterAbstractClass(CollectiblePickup).inheritsFrom<Pickupable>();
 
     /**

code/branches/core7/src/modules/questsystem/Quest.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    RegisterAbstractClass(Quest).inheritsFrom(Class(QuestItem));
+    RegisterAbstractClass(Quest).inheritsFrom<QuestItem>();
 
     /**

code/branches/core7/src/modules/questsystem/QuestEffect.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    RegisterAbstractClass(QuestEffect).inheritsFrom(Class(BaseObject));
+    RegisterAbstractClass(QuestEffect).inheritsFrom<BaseObject>();
 
     /**

code/branches/core7/src/modules/questsystem/effects/ChangeQuestStatus.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    RegisterAbstractClass(ChangeQuestStatus).inheritsFrom(Class(QuestEffect));
+    RegisterAbstractClass(ChangeQuestStatus).inheritsFrom<QuestEffect>();
 
     /**

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

@@ -113 +113 @@
     // ChatListener                                                         //
     //////////////////////////////////////////////////////////////////////////
-    RegisterAbstractClass(ChatListener).inheritsFrom(Class(Listable));
+    RegisterAbstractClass(ChatListener).inheritsFrom<Listable>();
 
     ChatListener::ChatListener()

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

@@ -44 +44 @@
 namespace orxonox
 {
-    RegisterAbstractClass(CollisionShape).inheritsFrom(Class(BaseObject)).inheritsFrom(Class(Synchronisable));
+    RegisterAbstractClass(CollisionShape).inheritsFrom<BaseObject>().inheritsFrom<Synchronisable>();
 
     /**

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

@@ -252 +252 @@
     ///////////////////////////////////////////////////////////////////////////
 
-    RegisterAbstractClass(GSLevelMemento).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(GSLevelMemento).inheritsFrom<OrxonoxInterface>();
 
     GSLevelMemento::GSLevelMemento()

code/branches/core7/src/orxonox/infos/PlayerInfo.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    RegisterAbstractClass(PlayerInfo).inheritsFrom(Class(Info));
+    RegisterAbstractClass(PlayerInfo).inheritsFrom<Info>();
 
     PlayerInfo::PlayerInfo(Context* context) : Info(context)

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

@@ -50 +50 @@
     // GametypeMessageListener
     //----------------------------
-    RegisterAbstractClass(GametypeMessageListener).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(GametypeMessageListener).inheritsFrom<OrxonoxInterface>();
 
     GametypeMessageListener::GametypeMessageListener()
@@ -60 +60 @@
     // PlayerTrigger
     //----------------------------
-    RegisterAbstractClass(PlayerTrigger).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(PlayerTrigger).inheritsFrom<OrxonoxInterface>();
 
     PlayerTrigger::PlayerTrigger()
@@ -80 +80 @@
     // RadarListener
     //----------------------------
-    RegisterAbstractClass(RadarListener).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(RadarListener).inheritsFrom<OrxonoxInterface>();
 
     RadarListener::RadarListener()
@@ -90 +90 @@
     // TeamColourable
     //----------------------------
-    RegisterAbstractClass(TeamColourable).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(TeamColourable).inheritsFrom<OrxonoxInterface>();
 
     TeamColourable::TeamColourable()
@@ -100 +100 @@
     // Rewardable
     //----------------------------
-    RegisterAbstractClass(Rewardable).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(Rewardable).inheritsFrom<OrxonoxInterface>();
 
     Rewardable::Rewardable()

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

@@ -41 +41 @@
 namespace orxonox
 {
-    RegisterAbstractClass(PickupCarrier).inheritsFrom(Class(OrxonoxInterface));
+    RegisterAbstractClass(PickupCarrier).inheritsFrom<OrxonoxInterface>();
 
     /**

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

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

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

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

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

@@ -43 +43 @@
 namespace orxonox
 {
-    RegisterAbstractClass(BaseSound).inheritsFrom(Class(Listable));
+    RegisterAbstractClass(BaseSound).inheritsFrom<Listable>();
 
     BaseSound::BaseSound()

code/branches/core7/src/orxonox/weaponsystem/WeaponMode.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    RegisterAbstractClass(WeaponMode).inheritsFrom(Class(BaseObject));
+    RegisterAbstractClass(WeaponMode).inheritsFrom<BaseObject>();
 
     WeaponMode::WeaponMode(Context* context) : BaseObject(context)

code/branches/core7/src/orxonox/worldentities/WorldEntity.cc

@@ -61 +61 @@
     BOOST_STATIC_ASSERT((int)Ogre::Node::TS_WORLD  == (int)WorldEntity::World);
 
-    RegisterAbstractClass(WorldEntity).inheritsFrom(Class(BaseObject)).inheritsFrom(Class(Synchronisable));
+    RegisterAbstractClass(WorldEntity).inheritsFrom<BaseObject>().inheritsFrom<Synchronisable>();
 
     /**