Changeset 996

Timestamp:

Apr 5, 2008, 9:47:12 PM (16 years ago)

Author:

bknecht

Message:

tolua++ works now. A level will now be sent through lua, before getting loaded by tinyxml.

Location:

code/branches/script

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/levels/sample.oxw (modified) (1 diff)
• bin/plugins.cfg-init (modified) (1 diff)
• cmake/FindToLua.cmake (added)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/core/Loader.cc (modified) (3 diffs)
• src/orxonox/script/Script.cc (modified) (5 diffs)
• src/orxonox/script/Script.h (modified) (3 diffs)
• src/orxonox/script/tolua_script.cc (added)
• src/orxonox/script/tolua_script.h (added)
• src/orxonox/script/tolua_script.pkg (added)

code/branches/script/CMakeLists.txt

@@ -72 +72 @@
 FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(Lua)
+FIND_PACKAGE(ToLua)
 
 #Sets the search paths for the linking

code/branches/script/bin/levels/sample.oxw

@@ -8 +8 @@
                         <ogg src="tha_silent_partner_-_void" />
                 </ambient>
-  </audio>
+  </audio> 
+
 -->
 

code/branches/script/bin/plugins.cfg-init

@@ -2 +2 @@
 
 # Define plugin folder
-PluginFolder=/usr/lib/OGRE
+PluginFolder=/usr/local/lib/OGRE
 
 # Define plugins

code/branches/script/src/orxonox/CMakeLists.txt

@@ -33 +33 @@
   objects/weapon/WeaponStation.cc
   script/Script.cc
+  script/tolua_script.cc
 )
 
@@ -43 +44 @@
   ${OIS_LIBRARIES}
   ${Lua_LIBRARIES}
+  ${ToLua_LIBRARIES}
   util
   core

code/branches/script/src/orxonox/core/Loader.cc

@@ -33 +33 @@
 #include "Debug.h"
 #include "CoreIncludes.h"
+#include "../script/Script.h"
 
 #include "util/tinyxml/ticpp.h"
@@ -107 +108 @@
         Loader::currentMask_s = level->getMask() * mask;
 
+        // let Lua work this out:
+        //Script* lua;
+        Script::loadFile(level->getFile(), true);
+        Script::init(Script::getLuaState());
+        Script::run();
+
         try
         {
@@ -112 +119 @@
             COUT(3) << "Mask: " << Loader::currentMask_s << std::endl;
 
-            ticpp::Document xmlfile(level->getFile());
-            xmlfile.LoadFile();
+            //ticpp::Document xmlfile(level->getFile());
+            //xmlfile.LoadFile();
+            //ticpp::Element myelement(*Script::getFileString());
+            ticpp::Document xmlfile;
+            //xmlfile.ToDocument();
+            xmlfile.Parse(*Script::getFileString(), true);
 
             for ( ticpp::Iterator<ticpp::Element> child = xmlfile.FirstChildElement(false); child != child.end(); child++ )

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

@@ -29 +29 @@
 
 #include <fstream>
+#include <map>
+
+#include "../core/CoreIncludes.h"
 
 extern "C" {
@@ -35 +38 @@
 }
 
+#include "tolua++.h"
+#include "tolua_script.h"
 
 namespace orxonox
 {
+
+  lua_State* Script::luaState_ = lua_open();
+  //lua_State* Script::luaState_ = NULL;
+  std::string Script::fileString_ = "";
+
   Script::Script()
   {
-    fileLines_ = std::list<std::string>();
-
-    state_ = lua_open();
+  }
+
+  Script::~Script()
+  {
+
+  }
+
+  /**
+      @brief Initializes a lua state
+      @param state_ the pointer of the lua_state to initialise
+  */
+  void Script::init(lua_State *state_)
+  {
+    tolua_script_open(state_);
+
+    /*
 #if LUA_VERSION_NUM == 501
     luaL_openlibs(state_);
@@ -53 +76 @@
     luaopen_debug(state_);
 #endif
-  }
-
-  Script::~Script()
-  {
-
+    */
+  }
+
+  void Script::luaPrint(std::string str)
+  {
+    fileString_ = str;
   }
 
@@ -63 +87 @@
       @brief Loads the specified file line by line
       @param filename The filename of the file
+      @param luaTags if true, the loaded file gets stripped off luaTags
   */
-  void Script::loadFile(std::string filename)
+  void Script::loadFile(std::string filename, bool luaTags)
   {
     std::ifstream file;
@@ -79 +104 @@
     {
       file.getline(line, 1024);
-      this->fileLines_.push_back(line);
-    }
-
-    // The last line is useless
-    this->fileLines_.pop_back();
+      fileString_ += line;
+    }
 
     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())
+    //std::string output;
+
+    if (luaTags) fileString_ = replaceLuaTags(Script::fileString_);
+  }
+
+  void Script::run()
+  {
+    int error = 0;
+    std::string init = "local scr = orxonox.Script:new()\n";
+    init += fileString_;
+    error = luaL_loadstring(luaState_, init.c_str());
+    if (error == 0)
+      error = lua_pcall(luaState_, 0, 0, 0);
+    if (error != 0) COUT(0) << "Error in Lua-script: " << lua_tostring(luaState_, -1) << std::endl;
+  }
+
+
+  unsigned int Script::getNextQuote(const std::string& text, unsigned int start)
+  {
+    unsigned int quote = start - 1;
+
+    while ((quote = text.find('\"', quote + 1)) != std::string::npos)
+    {
+      unsigned int backslash = quote;
+      unsigned int numbackslashes = 0;
+      for (; backslash > 0; backslash--, numbackslashes++)
+        if (text[backslash - 1] != '\\')
+          break;
+
+      if (numbackslashes % 2 == 0)
+        break;
+    }
+
+    return quote;
+  }
+
+  std::string Script::replaceLuaTags(const std::string& text)
+  {
+    // chreate map with all Lua tags
+    std::map<unsigned int, bool> luaTags;
+    {
+      unsigned int pos = 0;
+      while ((pos = text.find("<?lua", pos)) != std::string::npos)
+        luaTags[pos++] = true;
+    }
+    {
+      unsigned int pos = 0;
+      while ((pos = text.find("?>", pos)) != std::string::npos)
+        luaTags[pos++] = false;
+    }
+
+    // erase all tags from the map that are between two quotes
+    {
+      std::map<unsigned int, bool>::iterator it = luaTags.begin();
+      bool bBetweenQuotes = false;
+      unsigned int pos = 0;
+      while ((pos = getNextQuote(text, pos)) != std::string::npos)
       {
-        // 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())
+        while ((it != luaTags.end()) && ((*it).first < pos))
+        {
+          if (bBetweenQuotes)
+            luaTags.erase(it++);
+          else
+            ++it;
+        }
+        bBetweenQuotes = !bBetweenQuotes;
+        pos++;
+      }
+    }
+
+    // check whether on every opening <?lua tag a closing ?> tag follows
+    {
+      bool expectedValue = true;
+      for (std::map<unsigned int, bool>::iterator it = luaTags.begin(); it != luaTags.end(); ++it)
       {
-        // 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("]])");
+        if ((*it).second == expectedValue)
+          expectedValue = !expectedValue;
+        else
+        {
+          expectedValue = false;
+          break;
+        }
+      }
+      if (!expectedValue) {
+        // todo: errorhandling
+        return "";
+      }
+    }
+
+    // cut the original string into pieces and put them together with print() instead of lua tags
+    std::string output;
+    {
+      std::map<unsigned int, bool>::iterator it = luaTags.begin();
+      bool bInPrintFunction = true;
+      unsigned int start = 0;
+      unsigned int end = 0;
+
+      do
+      {
+        if (it != luaTags.end())
+          end = (*(it++)).first;
+        else
+          end = std::string::npos;
+
+        unsigned int equalSignCounter = 0;
+
+        if (bInPrintFunction)
+        {
+          // count ['='[ and ]'='] and replace tags with print([[ and ]])
+          std::string temp = text.substr(start, end - start);
+          {
+            unsigned int pos = 0;
+            while ((pos = temp.find('[', pos)) != std::string::npos)
+            {
+              unsigned int tempCounter = 1;
+              unsigned int tempPos = pos++;
+              while(temp[++tempPos] == '=') {
+                tempCounter++;
+              }
+              if(temp[tempPos] != '[') {
+                tempCounter = 0;
+              }
+              else if(tempCounter == 0) {
+                tempCounter = 1;
+              }
+              if (tempCounter > equalSignCounter)
+                equalSignCounter = tempCounter;
+            }
+          }
+          {
+            unsigned int pos = 0;
+            while ((pos = temp.find(']', pos)) != std::string::npos)
+            {
+              unsigned int tempCounter = 1;
+              unsigned int tempPos = pos++;
+              while(temp[++tempPos] == '=') {
+                tempCounter++;
+              }
+              if(temp[tempPos] != ']') {
+                tempCounter = 0;
+              }
+              else if(tempCounter == 0) {
+                tempCounter = 1;
+              }
+              if (tempCounter > equalSignCounter)
+                equalSignCounter = tempCounter;
+            }
+          }
+          std::string equalSigns = "";
+          for(unsigned int i = 0; i < equalSignCounter; i++) {
+            equalSigns += "=";
+          }
+          output += "scr:luaPrint([" + equalSigns + "[" + temp + "]" + equalSigns +"])\n";
+          start = end + 5;
+        }
+        else
+        {
+          output += text.substr(start, end - start);
+          start = end + 2;
+        }
+
+        bInPrintFunction = !bInPrintFunction;
+      }
+      while (end != std::string::npos);
+    }
+
+    return output;
   }
 

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

@@ -1 +1 @@
 /**
  @file  script.h
- @brief Representation of a lua script
+ @brief Representation of an interface to lua
  @author Benjamin Knecht <beni_at_orxonox.net>
  */
@@ -15 +15 @@
 #include <string>
 
-namespace orxonox
-{
+namespace orxonox // tolua_export
+{ // tolua_export
 
-  class Script
-  {
-    Script();
+  class Script // tolua_export
+  { // tolua_export
+    public:
+    Script(); // tolua_export
     ~Script();
 
-    void loadFile(std::string filename);
-    void xmlToLua();
+    static void loadFile(std::string filename, bool luaTags);
+    static void init(lua_State *state_);
+    //void xmlToLua();
+    static void run();
+    void luaPrint(std::string str); // tolua_export
 
-    inline lua_State* getLuaState() { return state_; };
+    inline static lua_State* getLuaState() { return luaState_; };
+    inline static std::string* getFileString() { return &fileString_; };
+
+    static unsigned int getNextQuote(const std::string& text, unsigned int start);
+    static std::string replaceLuaTags(const std::string& text);
 
     private:
@@ -32 +40 @@
       //std::list<std::string>& getLevelFileLines();
 
-      std::list<std::string> fileLines_;
-      lua_State* state_;
+      static std::string fileString_;
+      static lua_State* luaState_;
 
-  };
-}
+  }; // tolua_export
+} // tolua_export
 #endif /* _Script_H__ */