Changeset 5695 for code/trunk/src/orxonox/LevelManager.cc

Timestamp:

Aug 30, 2009, 2:22:00 AM (15 years ago)

Author:

rgrieder

Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/LevelManager.cc (modified) (2 diffs)

code/trunk/src/orxonox/LevelManager.cc

@@ -30 +30 @@
 
 #include <map>
-#include <boost/filesystem.hpp>
+#include <OgreResourceGroupManager.h>
 
 #include "core/CommandLine.h"
@@ -135 +135 @@
         availableLevels_.clear();
 
-        boost::filesystem::directory_iterator file(Core::getMediaPathString() + "levels");
-        boost::filesystem::directory_iterator end;
+        availableLevels_ = *Ogre::ResourceGroupManager::getSingleton().findResourceNames(
+            Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, "*.oxw");
 
-        while (file != end)
-        {
-            if (!boost::filesystem::is_directory(*file) && file->string()[file->string().length()-1] != '~')
+        for (std::vector<std::string>::iterator it = availableLevels_.begin(); it != availableLevels_.end();)
+            if (it->find("old/") == 0)
+                it = availableLevels_.erase(it);
+            else
             {
-                std::string filename = file->path().leaf();
-                if (filename.length() > 4)
-                    availableLevels_.push_back(filename.substr(0,filename.length()-4));
+                size_t pos = it->find(".oxw");
+                *it = it->substr(0, pos);
+                ++it;
             }
-            ++file;
-        }
     }
 }