Changeset 10392 for code/branches/core7/src/libraries/core/Loader.cc

Timestamp:

Apr 23, 2015, 10:44:57 PM (9 years ago)

Author:

landauf

Message:

Loader is now a singleton instead of a static class. fixes issue with statically initialized ClassTreeMask (which again requires a BaseObject-Identifier)

File:

• code/branches/core7/src/libraries/core/Loader.cc (modified) (9 diffs)

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

@@ -48 +48 @@
 namespace orxonox
 {
-    std::vector<std::pair<const XMLFile*, ClassTreeMask> > Loader::files_s;
-    ClassTreeMask Loader::currentMask_s;
+    Loader* Loader::singletonPtr_s = 0;
 
     bool Loader::open(const XMLFile* file, const ClassTreeMask& mask, bool bVerbose)
     {
-        Loader::add(file, mask);
-        return Loader::load(file, mask, bVerbose);
+        this->add(file, mask);
+        return this->load(file, mask, bVerbose);
     }
 
     void Loader::close()
     {
-        Loader::unload();
-        Loader::files_s.clear();
+        this->unload();
+        this->files_.clear();
     }
 
     void Loader::close(const XMLFile* file)
     {
-        Loader::unload(file);
-        Loader::remove(file);
+        this->unload(file);
+        this->remove(file);
     }
 
@@ -73 +72 @@
         if (!file)
             return;
-        Loader::files_s.insert(Loader::files_s.end(), std::pair<const XMLFile*, ClassTreeMask>(file, mask));
+        this->files_.insert(this->files_.end(), std::pair<const XMLFile*, ClassTreeMask>(file, mask));
     }
 
@@ -80 +79 @@
         if (!file)
             return;
-        for (std::vector<std::pair<const XMLFile*, ClassTreeMask> >::iterator it = Loader::files_s.begin(); it != Loader::files_s.end(); ++it)
+        for (std::vector<std::pair<const XMLFile*, ClassTreeMask> >::iterator it = this->files_.begin(); it != this->files_.end(); ++it)
         {
             if (it->first == file)
             {
-                Loader::files_s.erase(it);
+                this->files_.erase(it);
                 break;
             }
@@ -103 +102 @@
     {
         bool success = true;
-        for (std::vector<std::pair<const XMLFile*, ClassTreeMask> >::iterator it = Loader::files_s.begin(); it != Loader::files_s.end(); ++it)
-            if (!Loader::load(it->first, it->second * mask, bVerbose))
+        for (std::vector<std::pair<const XMLFile*, ClassTreeMask> >::iterator it = this->files_.begin(); it != this->files_.end(); ++it)
+            if (!this->load(it->first, it->second * mask, bVerbose))
                 success = false;
 
@@ -133 +132 @@
     bool Loader::reload(const ClassTreeMask& mask, bool bVerbose)
     {
-        Loader::unload(mask);
-        return Loader::load(mask, bVerbose);
+        this->unload(mask);
+        return this->load(mask, bVerbose);
     }
 
@@ -156 +155 @@
             return false;
 
-        Loader::currentMask_s = file->getMask() * mask;
+        this->currentMask_ = file->getMask() * mask;
 
         std::string xmlInput;
@@ -189 +188 @@
                 // start of the program.
                 // Assumption: the LevelInfo tag does not use Lua scripting
-                xmlInput = removeLuaTags(xmlInput);
+                xmlInput = Loader::removeLuaTags(xmlInput);
             }
         }
@@ -198 +197 @@
             {
                 orxout(user_info) << "Start loading " << file->getFilename() << "..." << endl;
-                orxout(internal_info, context::loader) << "Mask: " << Loader::currentMask_s << endl;
+                orxout(internal_info, context::loader) << "Mask: " << this->currentMask_ << endl;
             }
             else
             {
                 orxout(verbose, context::loader) << "Start loading " << file->getFilename() << "..." << endl;
-                orxout(verbose_more, context::loader) << "Mask: " << Loader::currentMask_s << endl;
+                orxout(verbose_more, context::loader) << "Mask: " << this->currentMask_ << endl;
             }
 
@@ -319 +318 @@
     bool Loader::reload(const XMLFile* file, const ClassTreeMask& mask, bool bVerbose)
     {
-        Loader::unload(file, mask);
-        return Loader::load(file, mask, bVerbose);
+        this->unload(file, mask);
+        return this->load(file, mask, bVerbose);
     }