Changeset 9572 for code/branches/core6

Timestamp:

Mar 24, 2013, 10:30:39 PM (12 years ago)

Author:

landauf

Message:

moved meta-object-list from Identifiable to Listable, a new base class for objects with objectlists (yep)

Location:

code/branches/core6/src/libraries/core

Files:

• CorePrereqs.h (modified) (1 diff)
• class/Identifiable.cc (modified) (2 diffs)
• class/Identifiable.h (modified) (2 diffs)
• class/Identifier.h (modified) (3 diffs)
• class/OrxonoxClass.h (modified) (2 diffs)
• object/CMakeLists.txt (modified) (1 diff)
• object/Listable.cc (added)
• object/Listable.h (added)

code/branches/core6/src/libraries/core/CorePrereqs.h

@@ -161 +161 @@
     class Iterator;
     class Language;
+    class Listable;
     class LuaFunctor;
     class LuaState;

code/branches/core6/src/libraries/core/class/Identifiable.cc

@@ -48 +48 @@
         this->identifier_ = 0;
         this->parents_ = 0;
-        this->metaList_ = new MetaObjectList();
         // Optimisation
         this->objectPointers_.reserve(6);
@@ -58 +57 @@
     Identifiable::~Identifiable()
     {
-//        if (!this->requestedDestruction_)
-//            orxout(internal_warning) << "Destroyed object without destroy() (" << this->getIdentifier()->getName() << ')' << endl;
-
-        this->unregisterObject();
-
         // parents_ exists only if isCreatingHierarchy() of the associated Identifier returned true while creating the class
         if (this->parents_)
             delete this->parents_;
-    }
-
-    /**
-        @brief Removes this object from the object-lists.
-    */
-    void Identifiable::unregisterObject()
-    {
-        if (this->metaList_)
-            delete this->metaList_;
-        this->metaList_ = 0;
     }
 

code/branches/core6/src/libraries/core/class/Identifiable.h

@@ -56 +56 @@
             Identifiable();
             virtual ~Identifiable();
-
-            void unregisterObject();
 
             /// Returns the Identifier of the object.
@@ -120 +118 @@
 
         private:
-            Identifier* identifier_;                                //!< The Identifier of the object
-            std::set<const Identifier*>* parents_;                  //!< List of all parents of the object
-            MetaObjectList* metaList_;                              //!< MetaObjectList, containing all ObjectLists and ObjectListElements the object is registered in
+            Identifier* identifier_;               //!< The Identifier of the object
+            std::set<const Identifier*>* parents_; //!< List of all parents of the object
 
             /// 'Fast map' that holds this-pointers of all derived types

code/branches/core6/src/libraries/core/class/Identifier.h

@@ -288 +288 @@
 
             bool initialiseObject(T* object, const std::string& className, bool bRootClass);
+
+            void addObjectToList(T* object, Listable*);
+            void addObjectToList(T* object, Identifiable*);
 
             void updateConfigValues(bool updateChildren = true) const;
@@ -392 +395 @@
         else
         {
-            orxout(verbose, context::object_list) << "Added object to " << this->getName() << "-list." << endl;
-            object->metaList_->add(this->objects_, this->objects_->add(new ObjectListElement<T>(object)));
+            this->addObjectToList(object, object);
 
             // Add pointer of type T to the map in the Identifiable instance that enables "dynamic_casts"
@@ -399 +401 @@
             return false;
         }
+    }
+
+    /**
+     * @brief Only adds the object to the object list if is a @ref Listable
+     */
+    template <class T>
+    void ClassIdentifier<T>::addObjectToList(T* object, Listable*)
+    {
+        orxout(verbose, context::object_list) << "Added object to " << this->getName() << "-list." << endl;
+        object->metaList_->add(this->objects_, this->objects_->add(new ObjectListElement<T>(object)));
+    }
+
+    template <class T>
+    void ClassIdentifier<T>::addObjectToList(T*, Identifiable*)
+    {
+        // no action
     }
 

code/branches/core6/src/libraries/core/class/OrxonoxClass.h

@@ -43 +43 @@
 #include "core/CorePrereqs.h"
 
-#include "Identifiable.h"
+#include "core/object/Listable.h"
 #include "core/object/Destroyable.h"
 
@@ -53 +53 @@
         The BaseObject and Interfaces are derived with @c virtual @c public @c OrxonoxClass from OrxonoxClass.
     */
-    class _CoreExport OrxonoxClass : public Identifiable, public Destroyable
+    class _CoreExport OrxonoxClass : virtual public Listable, virtual public Destroyable
     {
         public:

code/branches/core6/src/libraries/core/object/CMakeLists.txt

@@ -3 +3 @@
   ContextObject.cc
   Destroyable.cc
+  Listable.cc
   MetaObjectList.cc
   ObjectListBase.cc