Changeset 9608 for code/branches/core6/src

Timestamp:

Mar 30, 2013, 10:40:48 PM (11 years ago)

Author:

landauf

Message:

implemented method to change the context of a Listable. the object will then be added to the object lists of the new context

Location:

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

Files:

• Context.cc (modified) (1 diff)
• Context.h (modified) (2 diffs)
• Listable.cc (modified) (1 diff)
• Listable.h (modified) (1 diff)
• ObjectListBase.cc (modified) (2 diffs)
• ObjectListBase.h (modified) (4 diffs)

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

@@ -47 +47 @@
     /*static*/ Context* Context::getRootContext()
     {
-        static Context rootContext(NULL);
+        static Context rootContext;
         return &rootContext;
     }

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

@@ -39 +39 @@
 #include <vector>
 
-#include "ObjectListBase.h"
-
 namespace orxonox
 {
@@ -48 +46 @@
             static Context* getRootContext();
 
-            Context(Context* context);
+            Context(Context* context = NULL);
             virtual ~Context();
 

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

@@ -64 +64 @@
         this->elements_.clear();
     }
+
+    /**
+     * @brief Changes the context.
+     * The object is removed from the current context and added to the new one. This also applies to all object lists the object is registered in.
+     */
+    void Listable::setContext(Context* context)
+    {
+        this->context_ = context;
+        for (size_t i = 0; i < this->elements_.size(); ++i)
+            this->elements_[i]->changeContext(context);
+    }
+
 }

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

@@ -57 +57 @@
             void unregisterObject();
 
-            inline void setContext(Context* context)
-                { this->context_ = context; }
+            void setContext(Context* context);
             inline Context* getContext() const
                 { return this->context_; }

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

@@ -41 +41 @@
 namespace orxonox
 {
-    ObjectListBaseElement::~ObjectListBaseElement()
+    // ###############################
+    // ###  ObjectListBaseElement  ###
+    // ###############################
+    void ObjectListBaseElement::removeFromList()
     {
         if (this->list_)
@@ -47 +50 @@
     }
 
+    // ###############################
+    // ###     ObjectListBase      ###
+    // ###############################
     /**
         @brief Constructor: Sets default values.

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

@@ -42 +42 @@
 #include "core/CorePrereqs.h"
 #include <vector>
+#include "Context.h"
 
 namespace orxonox
@@ -57 +58 @@
             */
             ObjectListBaseElement(Listable* object) : next_(0), prev_(0), objectBase_(object), list_(0) {}
-            ~ObjectListBaseElement();
+            virtual ~ObjectListBaseElement() { this->removeFromList(); }
+
+            virtual void changeContext(Context* context) = 0;
 
             ObjectListBaseElement* next_;       //!< The next element in the list
@@ -63 +66 @@
             Listable* objectBase_;              //!< The object
             ObjectListBase* list_;              //!< The list
+
+        protected:
+            void removeFromList();
     };
 
@@ -75 +81 @@
         public:
             ObjectListElement(T* object) : ObjectListBaseElement(static_cast<Listable*>(object)), object_(object) {}
+
+            virtual void changeContext(Context* context)
+            {
+                this->removeFromList();
+                context->getObjectList<T>()->addElement(this);
+            }
+
             T* object_;              //!< The object
     };