Changeset 1019 for code/branches/script/src/orxonox

Timestamp:

Apr 10, 2008, 4:28:51 PM (17 years ago)

Author:

bknecht

Message:

You can now use lua tags everywhere in the XML file you want: It'll work. Even wrongly put tags are corrected now. Read the wikipages about scripting to see how you can use it.

Location:

code/branches/script/src/orxonox/core

Files:

• Loader.cc (modified) (1 diff)
• Script.cc (modified) (7 diffs)
• Script.h (modified) (1 diff)

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

@@ -114 +114 @@
         Script::run();*/
         Script* lua = Script::getInstance();
+        lua->loadFile(level->getFile(), true);
+        lua->run();
 
         try

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

@@ -39 +39 @@
 
 #include "tolua++.h"
-#include "toluabind.h"
+#include "../../util/tolua/tolua_bind.h"
 
 namespace orxonox
 {
+  Script* Script::singletonRef = NULL;
 
   Script::Script()
@@ -48 +49 @@
     luaState_ = lua_open();
     luaSource_ = "";
-    tolua_something_open(luaState_);
+    luaL_openlibs(luaState_);
+    tolua_orxonox_open(luaState_);
+    output_;
   }
 
   void Script::luaPrint(std::string str)
   {
-    output_ = str;
+    output_ += str;
+    COUT(0) << "Lua_output!:" << std::endl << str << std::endl << "***" << std::endl;
   }
 
@@ -78 +82 @@
       file.getline(line, 1024);
       levelString += line;
+      levelString += "\n";
     }
 
@@ -84 +89 @@
 
     if (luaTags) luaSource_ = replaceLuaTags(levelString);
+    COUT(0) << "ParsedSourceCode: " << luaSource_ << std::endl;
   }
 
@@ -89 +95 @@
   {
     int error = 0;
-    std::string init = "local scr = orxonox.Script:new()\n";
+    std::string init = "local scr = orxonox.Script:getInstance()\nprint = function(s)\nscr:luaPrint(s)\nend\n";
     init += luaSource_;
     error = luaL_loadstring(luaState_, init.c_str());
@@ -135 +141 @@
     {
       std::map<unsigned int, bool>::iterator it = luaTags.begin();
+      std::map<unsigned int, bool>::iterator it2 = it;
       bool bBetweenQuotes = false;
+      bool bBetweenTags = false;
       unsigned int pos = 0;
       while ((pos = getNextQuote(text, pos)) != std::string::npos)
       {
-        while ((it != luaTags.end()) && ((*it).first < pos))
-        {
-          if (bBetweenQuotes)
-            luaTags.erase(it++);
+        while ((it != luaTags.end()) && (it->first < pos))
+        {
+          if (bBetweenQuotes) {
+            it2++;
+            if(it->second && !(it2->second) && it2->first < pos)
+              it = ++it2;
+            else
+              luaTags.erase(it++);
+          }
           else
             ++it;
@@ -233 +246 @@
             equalSigns += "=";
           }
-          output += "scr:luaPrint([" + equalSigns + "[" + temp + "]" + equalSigns +"])\n";
+          output += "print([" + equalSigns + "[" + temp + "]" + equalSigns +"])";
           start = end + 5;
         }

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

@@ -21 +21 @@
   { // tolua_export
     public:
-      inline static Script* getInstance() { if (!Script::singletonRef) Script::singletonRef = new Script(); return Script::singletonRef; }
+      inline static Script* getInstance() { if (!Script::singletonRef) Script::singletonRef = new Script(); return Script::singletonRef; } // tolua_export
       inline ~Script() { Script::singletonRef = NULL; };