Changeset 9606 for code/branches/core6/src/libraries/core/object

Timestamp:

Mar 30, 2013, 7:26:54 PM (12 years ago)

Author:

landauf

Message:

object lists are now stored in a Context object instead of Identifiers

Location:

code/branches/core6/src/libraries/core/object

Files:

• Context.cc (modified) (2 diffs)
• Context.h (modified) (3 diffs)
• Listable.cc (modified) (2 diffs)
• Listable.h (modified) (2 diffs)
• ObjectList.h (modified) (6 diffs)
• ObjectListBase.cc (modified) (1 diff)
• ObjectListBase.h (modified) (1 diff)

code/branches/core6/src/libraries/core/object/Context.cc

@@ -33 +33 @@
 
 #include "Context.h"
+#include "core/class/Identifier.h"
 
 namespace orxonox
@@ -49 +50 @@
         return &rootContext;
     }
+
+    ObjectListBase* Context::getObjectList(const Identifier* identifier)
+    {
+        unsigned int classID = identifier->getClassID();
+        if (classID >= this->objectLists_.size())
+            this->objectLists_.resize(classID + 1);
+        if (!this->objectLists_[classID])
+            this->objectLists_[classID] = new ObjectListBase();
+        return this->objectLists_[classID];
+    }
 }

code/branches/core6/src/libraries/core/object/Context.h

@@ -37 +37 @@
 #include "core/CorePrereqs.h"
 
+#include <vector>
+
+#include "ObjectListBase.h"
+
 namespace orxonox
 {
@@ -42 +46 @@
     {
         public:
+            static Context* getRootContext();
+
             Context(Context* context);
             virtual ~Context();
@@ -48 +54 @@
                 { return this->parentContext_; }
 
-            static Context* getRootContext();
+            ObjectListBase* getObjectList(const Identifier* identifier);
+
+            template <class T>
+            inline ObjectListBase* getObjectList()
+                { return this->getObjectList(ClassIdentifier<T>::getIdentifier()); }
+
+            template <class T>
+            inline void addObject(T* object)
+            {
+                ObjectListBaseElement* element = this->getObjectList<T>()->add(object);
+                object->elements_.push_back(element);
+                if (this->getParentContext())
+                    this->getParentContext()->addObject(object);
+            }
 
         private:
             Context* parentContext_;
+            std::vector<ObjectListBase*> objectLists_;
     };
 }

code/branches/core6/src/libraries/core/object/Listable.cc

@@ -34 +34 @@
 #include "Listable.h"
 #include "ObjectListBase.h"
+#include "Context.h"
 
 namespace orxonox
@@ -42 +43 @@
     Listable::Listable()
     {
+        this->context_ = Context::getRootContext();
         this->elements_.reserve(6);
     }

code/branches/core6/src/libraries/core/object/Listable.h

@@ -49 +49 @@
     class _CoreExport Listable : virtual public Identifiable
     {
-        template <class T>
-        friend class ClassIdentifier;
+        friend class Context;
 
         public:
@@ -58 +57 @@
             void unregisterObject();
 
+            inline void setContext(Context* context)
+                { this->context_ = context; }
+            inline Context* getContext() const
+                { return this->context_; }
+
         private:
+            Context* context_;                             //!< The object will register itself in the object lists of this context
             std::vector<ObjectListBaseElement*> elements_; //!< The corresponding ObjectListElements in all object lists the object is registered in
     };

code/branches/core6/src/libraries/core/object/ObjectList.h

@@ -49 +49 @@
 #include "ObjectListBase.h"
 #include "ObjectListIterator.h"
+#include "Context.h"
 
 namespace orxonox
@@ -71 +72 @@
             inline static size_t size()
             {
-                return ClassIdentifier<T>::getIdentifier()->getObjects()->size();
+                return Context::getRootContext()->getObjectList<T>()->size();
             }
 
@@ -77 +78 @@
             inline static ObjectListElement<T>* begin()
             {
-                ObjectListBase* list = ClassIdentifier<T>::getIdentifier()->getObjects();
+                ObjectListBase* list = Context::getRootContext()->getObjectList<T>();
                 return static_cast<ObjectListElement<T>*>(list->begin());
             }
@@ -84 +85 @@
             inline static ObjectListElement<T>* end()
             {
-                ObjectListBase* list = ClassIdentifier<T>::getIdentifier()->getObjects();
+                ObjectListBase* list = Context::getRootContext()->getObjectList<T>();
                 return static_cast<ObjectListElement<T>*>(list->end());
             }
@@ -91 +92 @@
             inline static ObjectListElement<T>* rbegin()
             {
-                ObjectListBase* list = ClassIdentifier<T>::getIdentifier()->getObjects();
+                ObjectListBase* list = Context::getRootContext()->getObjectList<T>();
                 return static_cast<ObjectListElement<T>*>(list->rbegin());
             }
@@ -98 +99 @@
             inline static ObjectListElement<T>* rend()
             {
-                ObjectListBase* list = ClassIdentifier<T>::getIdentifier()->getObjects();
+                ObjectListBase* list = Context::getRootContext()->getObjectList<T>();
                 return static_cast<ObjectListElement<T>*>(list->rend());
             }

code/branches/core6/src/libraries/core/object/ObjectListBase.cc

@@ -89 +89 @@
         }
 
+        if (element->objectBase_)
+            orxout(verbose, context::object_list) << "Added object to " << element->objectBase_->getIdentifier()->getName() << "-list." << endl;
+
         if (!this->last_)
         {

code/branches/core6/src/libraries/core/object/ObjectListBase.h

@@ -124 +124 @@
 
             /// Returns a pointer to the first element in the list. Works only with Iterator.
-            inline ObjectListBaseElement* begin() { return this->first_; }
+            inline ObjectListBaseElement* begin() const { return this->first_; }
             /// Returns a pointer to the element after the last element in the list. Works only with Iterator.
-            inline ObjectListBaseElement* end() { return 0; }
+            inline ObjectListBaseElement* end() const { return 0; }
             /// Returns a pointer to the last element in the list. Works only with Iterator.
-            inline ObjectListBaseElement* rbegin() { return this->last_; }
+            inline ObjectListBaseElement* rbegin() const { return this->last_; }
             /// Returns a pointer to the element in front of the first element in the list. Works only with Iterator.
-            inline ObjectListBaseElement* rend() { return 0; }
+            inline ObjectListBaseElement* rend() const { return 0; }
 
             inline void registerRemovalListener(ObjectListElementRemovalListener* listener) { this->listeners_.push_back(listener); }