Changeset 9649 for code/branches/core6/src/libraries

Timestamp:

Aug 14, 2013, 6:42:28 PM (11 years ago)

Author:

landauf

Message:

added ability to set the root-context explicitly (and also to destroy it before the class-hierarchy is destroyed).
currently it's not possible to set the root context explicitly during startup of the game because it is already used by static initialization

Location:

code/branches/core6/src/libraries/core

Files:

• Core.cc (modified) (1 diff)
• object/Context.cc (modified) (2 diffs)
• object/Context.h (modified) (2 diffs)

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

@@ -248 +248 @@
         safeObjectDelete(&configFileManager_);
         ConsoleCommand::destroyAll();
+        Context::setRootContext(NULL);
         IdentifierManager::getInstance().destroyAllIdentifiers();
         safeObjectDelete(&signalHandler_);

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

@@ -37 +37 @@
 namespace orxonox
 {
+    Context* Context::rootContext_s = 0;
+
     Context::Context(Context* context) : Listable(this), parentContext_(context)
     {
@@ -54 +56 @@
     }
 
+    /*static*/ void Context::setRootContext(Context* context)
+    {
+        if (Context::rootContext_s)
+            delete Context::rootContext_s;
+        Context::rootContext_s = context;
+    }
+
     /*static*/ Context* Context::getRootContext()
     {
-        static Context rootContext(NULL);
-        return &rootContext;
+        if (!Context::rootContext_s)
+            Context::rootContext_s = new Context(NULL);
+        return Context::rootContext_s;
     }
 

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

@@ -46 +46 @@
     {
         public:
+            static void setRootContext(Context* context);
             static Context* getRootContext();
 
@@ -72 +73 @@
             Context* parentContext_;
             std::vector<ObjectListBase*> objectLists_;
+
+            static Context* rootContext_s;
     };
 }