Changeset 956

Timestamp:

Mar 30, 2008, 4:03:19 AM (17 years ago)

Author:

bknecht

Message:

loads level from file and creates lua code from XML code. not tested yet though

Location:

code/branches/script

Files:

• cmake/FindLua.cmake (modified) (2 diffs)
• src/orxonox/script/Script.cc (modified) (3 diffs)
• src/orxonox/script/Script.h (modified) (2 diffs)

code/branches/script/cmake/FindLua.cmake

@@ -23 +23 @@
         /usr/local/lib)
 
-ADD_DEFINITIONS(-DLUA_VERSION=51)
-
 IF (NOT Lua_LIBRARIES AND Lua_INCLUDE_DIR)
 FIND_PATH(Lua_INCLUDE_DIR lua.h
@@ -42 +40 @@
 
 SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY})
-ADD_DEFINITIONS(-DLUA_VERSION=50)
 
 ENDIF (NOT Lua_LIBRARIES AND Lua_INCLUDE_DIR)

code/branches/script/src/orxonox/script/Script.cc

@@ -27 +27 @@
 
 #include "Script.h"
+
+#include <fstream>
+
 extern "C" {
 #include "lualib.h"
@@ -37 +40 @@
   Script::Script()
   {
+    fileLines_ = std::list<std::string>();
+
     state_ = lua_open();
-#if Lua_VERSION == 51
+#if LUA_VERSION_NUM == 501
     luaL_openlibs(state_);
 #else
@@ -55 +60 @@
   }
 
+  /**
+      @brief Loads the specified file line by line
+      @param filename The filename of the file
+  */
+  void Script::loadFile(std::string filename)
+  {
+    std::ifstream file;
+    file.open(filename.c_str(), std::fstream::in);
+
+    if (!file.is_open())
+    {
+      // some error msg
+    }
+
+    char line[1024];
+
+    while (file.good() && !file.eof())
+    {
+      file.getline(line, 1024);
+      this->fileLines_.push_back(line);
+    }
+
+    // The last line is useless
+    this->fileLines_.pop_back();
+
+    file.close();
+  }
+
+  /**
+      @brief Parses the level file to correct Lua code
+  */
+  void Script::xmlToLua()
+  {
+    // We will iterate through all the lines and replace things.
+    std::list<std::string>::iterator it;
+    for(it = this->fileLines_.begin(); it != this->fileLines_.end(); ++it)
+    {
+      int pos = (*it).find("<?lua");
+      while (pos < (int)(*it).length())
+      {
+        // We found a lua tag
+        std::string front = (*it).substr(0,pos);
+        std::string back = (*it).substr(pos + 5);
+        (*it) = front + "]])" + back;
+        pos = (*it).find("<?lua");
+      }
+
+      pos = (*it).find("?>");
+      while (pos < (int)(*it).length())
+      {
+        // We found a lua tag
+        std::string front = (*it).substr(0,pos);
+        std::string back = (*it).substr(pos + 2);
+        (*it) = front + "print([[" + back;
+        pos = (*it).find("?>");
+      }
+    }
+    this->fileLines_.push_front("print([[");
+    this->fileLines_.push_back("]])");
+  }
+
 }

code/branches/script/src/orxonox/script/Script.h

@@ -12 +12 @@
 }
 
+#include <list>
+#include <string>
+
 namespace orxonox
 {
@@ -20 +23 @@
     ~Script();
 
+    void loadFile(std::string filename);
+    void xmlToLua();
+
     inline lua_State* getLuaState() { return state_; };
 
     private:
+
+      //std::list<std::string>& getLevelFileLines();
+
+      std::list<std::string> fileLines_;
       lua_State* state_;