Changeset 10508 for code/branches/core7/src

Timestamp:

May 30, 2015, 10:18:07 AM (9 years ago)

Author:

landauf

Message:

removed unused code from Loader

Location:

code/branches/core7/src

Files:

• libraries/core/GraphicsManager.cc (modified) (3 diffs)
• libraries/core/Loader.cc (modified) (2 diffs)
• libraries/core/Loader.h (modified) (1 diff)
• orxonox/Level.cc (modified) (1 diff)
• orxonox/gamestates/GSLevel.cc (modified) (1 diff)

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

@@ -117 +117 @@
         resources_.reset(new XMLFile("DefaultResources.oxr"));
         resources_->setLuaSupport(false);
-        Loader::getInstance().open(resources_.get(), ClassTreeMask(), false);
+        Loader::getInstance().load(resources_.get(), ClassTreeMask(), false);
 
         // Only for runs in the build directory (not installed)
@@ -125 +125 @@
         extResources_.reset(new XMLFile("resources.oxr"));
         extResources_->setLuaSupport(false);
-        Loader::getInstance().open(extResources_.get(), ClassTreeMask(), false);
+        Loader::getInstance().load(extResources_.get(), ClassTreeMask(), false);
 
         if (bLoadRenderer)
@@ -330 +330 @@
         orxout(internal_info) << "Loading Debug Overlay..." << endl;
         debugOverlay_.reset(new XMLFile("debug.oxo"));
-        Loader::getInstance().open(debugOverlay_.get(), ClassTreeMask(), false);
+        Loader::getInstance().load(debugOverlay_.get(), ClassTreeMask(), false);
     }
 

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

@@ -49 +49 @@
 {
     Loader* Loader::singletonPtr_s = 0;
-
-    bool Loader::open(const XMLFile* file, const ClassTreeMask& mask, bool bVerbose)
-    {
-        this->add(file, mask);
-        return this->load(file, mask, bVerbose);
-    }
-
-    void Loader::close()
-    {
-        this->unload();
-        this->files_.clear();
-    }
-
-    void Loader::close(const XMLFile* file)
-    {
-        this->unload(file);
-        this->remove(file);
-    }
-
-    void Loader::add(const XMLFile* file, const ClassTreeMask& mask)
-    {
-        if (!file)
-            return;
-        this->files_.insert(this->files_.end(), std::pair<const XMLFile*, ClassTreeMask>(file, mask));
-    }
-
-    void Loader::remove(const XMLFile* file)
-    {
-        if (!file)
-            return;
-        for (std::vector<std::pair<const XMLFile*, ClassTreeMask> >::iterator it = this->files_.begin(); it != this->files_.end(); ++it)
-        {
-            if (it->first == file)
-            {
-                this->files_.erase(it);
-                break;
-            }
-        }
-    }
-
-    /**
-    @brief
-        Loads all opened files, while conforming to the restrictions given by the input ClassTreeMask.
-    @param mask
-        A ClassTreeMask, which defines which types of classes are loaded and which aren't.
-    @param bVerbose
-        Whether the loader is verbose (prints its progress in a low output level) or not.
-    @return
-        Returns true if successful.
-    */
-    bool Loader::load(const ClassTreeMask& mask, bool bVerbose)
-    {
-        bool success = true;
-        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;
-
-        return success;
-    }
-
-    void Loader::unload(const ClassTreeMask& mask)
-    {
-        for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); )
-        {
-            if (mask.isIncluded(it->getIdentifier()))
-                (it++)->destroy();
-            else
-                ++it;
-        }
-    }
-
-    /**
-    @brief
-        Reloads all opened files, while conforming to the restrictions given by the input ClassTreeMask.
-    @param mask
-        A ClassTreeMask, which defines which types of classes are reloaded and which aren't.
-    @param bVerbose
-        Whether the loader is verbose (prints its progress in a low output level) or not.
-    @return
-        Returns true if successful.
-    */
-    bool Loader::reload(const ClassTreeMask& mask, bool bVerbose)
-    {
-        this->unload(mask);
-        return this->load(mask, bVerbose);
-    }
 
     /**
@@ -302 +216 @@
                 ++it;
         }
-    }
-
-    /**
-    @brief
-        Reloads the input file, while conforming to the restrictions given by the input ClassTreeMask.
-    @param file
-        The file to be reloaded.
-    @param mask
-        A ClassTreeMask, which defines which types of classes are reloaded and which aren't.
-    @param bVerbose
-        Whether the loader is verbose (prints its progress in a low output level) or not.
-    @return
-        Returns true if successful.
-    */
-    bool Loader::reload(const XMLFile* file, const ClassTreeMask& mask, bool bVerbose)
-    {
-        this->unload(file, mask);
-        return this->load(file, mask, bVerbose);
     }
 

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

@@ -55 +55 @@
 
         public:
-            bool open(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask(), bool bVerbose = true);
-            void close();
-            void close(const XMLFile* file);
-
-            void add(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask());
-            void remove(const XMLFile* file);
-
-            bool load(const ClassTreeMask& mask = ClassTreeMask(), bool bVerbose = true);
-            void unload(const ClassTreeMask& mask = ClassTreeMask());
-            bool reload(const ClassTreeMask& mask = ClassTreeMask(), bool bVerbose = true);
-
             bool load(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask(),
                       bool bVerbose = true, bool bRemoveLuaTags = false);
             void unload(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask());
-            bool reload(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask(), bool bVerbose = true);
 
             static std::string replaceLuaTags(const std::string& text);

code/branches/core7/src/orxonox/Level.cc

@@ -95 +95 @@
         this->xmlfile_ = new XMLFile(mask, this->xmlfilename_);
 
-        Loader::getInstance().open(this->xmlfile_);
+        Loader::getInstance().load(this->xmlfile_);
     }
 

code/branches/core7/src/orxonox/gamestates/GSLevel.cc

@@ -168 +168 @@
         // call the loader
         startFile_ = new XMLFile(LevelManager::getInstance().getDefaultLevel());
-        bool loaded = Loader::getInstance().open(startFile_);
+        bool loaded = Loader::getInstance().load(startFile_);
 
         Core::getInstance().getConfig()->updateLastLevelTimestamp();