Changeset 3008 for code/trunk/src

Timestamp:

May 21, 2009, 5:16:29 PM (16 years ago)

Author:

bknecht

Message:

You don't need no —level or -l anymore now. You may choose your favorite level from the main menu

Location:

code/trunk/src

Files:

• core/Loader.cc (modified) (3 diffs)
• core/Loader.h (modified) (1 diff)
• orxonox/gamestates/GSLevel.cc (modified) (4 diffs)
• orxonox/gamestates/GSLevel.h (modified) (2 diffs)
• orxonox/gui/GUIManager.cc (modified) (2 diffs)
• orxonox/gui/GUIManager.h (modified) (1 diff)

code/trunk/src/core/Loader.cc

@@ -30 +30 @@
 
 #include <tinyxml/ticpp.h>
+#include <boost/filesystem.hpp>
 
 #include "XMLFile.h"
@@ -41 +42 @@
 #include "util/Debug.h"
 #include "util/Exception.h"
+#include "Core.h"
 
 namespace orxonox
@@ -210 +212 @@
         return Loader::load(file, mask);
     }
+
+    std::vector<std::string> Loader::getLevelList()
+    {
+        std::vector<std::string> levelList;
+
+        boost::filesystem::directory_iterator file(Core::getMediaPathString() + "levels");
+        boost::filesystem::directory_iterator end;
+
+        while (file != end)
+        {
+            if (!boost::filesystem::is_directory(*file) && file->string()[file->string().length()-1] != '~')
+            {
+                std::string filename = file->path().leaf();
+                if (filename.length() > 4)
+                    levelList.push_back(filename.substr(0,filename.length()-4));
+            }
+            ++file;
+        }
+        return levelList;
+    }
 }

code/trunk/src/core/Loader.h

@@ -57 +57 @@
 
             static ClassTreeMask currentMask_s;
+            static std::vector<std::string> getLevelList();
 
         private:

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -60 +60 @@
     SetCommandLineArgument(level, "presentation_dm.oxw").shortcut("l");
     SetConsoleCommand(GSLevel, showIngameGUI, true);
+    SetConsoleCommand(GSLevel, setLevel, true);
+
+    XMLFile* GSLevel::startFile_s = NULL;
 
     GSLevel::GSLevel(const std::string& name)
@@ -68 +71 @@
         , guiKeysOnlyInputState_(0)
         , radar_(0)
-        , startFile_(0)
         , cameraManager_(0)
         , levelManager_(0)
@@ -252 +254 @@
         COUT(0) << "Loading level..." << std::endl;
         std::string levelName;
-        CommandLine::getValue("level", &levelName);
-        startFile_ = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);
-        Loader::open(startFile_);
+        if (!startFile_s)
+        {
+            CommandLine::getValue("level", &levelName);
+            startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);
+        }
+        Loader::open(startFile_s);
+    }
+
+    void GSLevel::setLevel(std::string levelName)
+    {
+        delete GSLevel::startFile_s;
+        GSLevel::startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);
     }
 
@@ -265 +276 @@
         //////////////////////////////////////////////////////////////////////////////////////////
 
-        delete this->startFile_;
+        delete startFile_s;
     }
 

code/trunk/src/orxonox/gamestates/GSLevel.h

@@ -48 +48 @@
 
         static void showIngameGUI(bool show);
+        static void setLevel(std::string levelName);
+
+        static XMLFile* startFile_s;
 
     protected:
@@ -63 +66 @@
         SimpleInputState*     guiKeysOnlyInputState_;   //!< input state if we only need the keys to use the GUI
         Radar*                radar_;                   //!< represents the Radar (not the HUD part)
-        XMLFile*              startFile_;               //!< current hard coded default level
         CameraManager*        cameraManager_;           //!< camera manager for this level
         LevelManager*         levelManager_;            //!< global level manager

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -55 +55 @@
 #include "ToluaBindCore.h"
 #include "ToluaBindOrxonox.h"
+#include "core/Loader.h"
 
 extern "C" {
@@ -238 +239 @@
             COUT(2) << "CEGUI Error: \"" << ex.getMessage() << "\" while executing code \"" << str << "\"" << std::endl;
         }
+    }
+
+    /**
+
+    */
+    void GUIManager::getLevelList()
+    {
+        lua_State* L = this->scriptModule_->getLuaState();
+        lua_newtable(L);
+
+        std::vector<std::string> list = Loader::getLevelList();
+
+        int j = 1;
+        for (std::vector<std::string>::iterator i = list.begin(); i != list.end(); i++)
+        {
+            lua_pushnumber(L,j);
+            lua_pushstring(L,i->c_str());
+            lua_settable(L,-3);
+            j++;
+        }
+        lua_setglobal(L, "levellist");
     }
 

code/trunk/src/orxonox/gui/GUIManager.h

@@ -97 +97 @@
         static GUIManager* getInstancePtr() { return singletonRef_s; }
 
+        void getLevelList(); //tolua_export
+
     private:
         GUIManager(const GUIManager& instance);                 //!< private constructor (this is a singleton class)