Changeset 1019 for code/branches/script/src

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

Files:

• orxonox/core/Loader.cc (modified) (1 diff)
• orxonox/core/Script.cc (modified) (7 diffs)
• orxonox/core/Script.h (modified) (1 diff)
• util/tolua/tolua.pkg (moved) (moved from code/branches/script/src/orxonox/core/tolua.pkg) (1 diff)
• util/tolua/tolua_bind.cc (moved) (moved from code/branches/script/src/util/tolua_bind.cc) (11 diffs)
• util/tolua/tolua_bind.h (moved) (moved from code/branches/script/src/util/tolua_bind.h) (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; };
 

code/branches/script/src/util/tolua/tolua.pkg

@@ -1 @@
-$cfile "Script.h"
+$cfile "../../orxonox/core/Script.h"

code/branches/script/src/util/tolua/tolua_bind.cc

@@ -1 +1 @@
 /*
-** Lua binding: script
-** Generated automatically by tolua++-1.0.92 on Sat Apr  5 20:29:18 2008.
+** Lua binding: orxonox
+** Generated automatically by tolua++-1.0.92 on Sun Apr  6 15:44:17 2008.
 */
 
@@ -12 +12 @@
 
 /* Exported function */
-TOLUA_API int  tolua_script_open (lua_State* tolua_S);
+TOLUA_API int  tolua_orxonox_open (lua_State* tolua_S);
 
-#include "Script.h"
-
-/* function to release collected object via destructor */
-#ifdef __cplusplus
-
-static int tolua_collect_orxonox__Script (lua_State* tolua_S)
-{
- orxonox::Script* self = (orxonox::Script*) tolua_tousertype(tolua_S,1,0);
-        Mtolua_delete(self);
-        return 0;
-}
-#endif
-
+#include "../../orxonox/core/Script.h"
 
 /* function to register type */
@@ -34 +22 @@
 }
 
-/* method: new of class  orxonox::Script */
-#ifndef TOLUA_DISABLE_tolua_script_orxonox_Script_new00
-static int tolua_script_orxonox_Script_new00(lua_State* tolua_S)
+/* method: getInstance of class  orxonox::Script */
+#ifndef TOLUA_DISABLE_tolua_orxonox_orxonox_Script_getInstance00
+static int tolua_orxonox_orxonox_Script_getInstance00(lua_State* tolua_S)
 {
 #ifndef TOLUA_RELEASE
@@ -49 +37 @@
  {
   {
-   orxonox::Script* tolua_ret = (orxonox::Script*)  Mtolua_new((orxonox::Script)());
+   orxonox::Script* tolua_ret = (orxonox::Script*)  orxonox::Script::getInstance();
     tolua_pushusertype(tolua_S,(void*)tolua_ret,"orxonox::Script");
   }
@@ -56 +44 @@
 #ifndef TOLUA_RELEASE
  tolua_lerror:
- tolua_error(tolua_S,"#ferror in function 'new'.",&tolua_err);
- return 0;
-#endif
-}
-#endif //#ifndef TOLUA_DISABLE
-
-/* method: new_local of class  orxonox::Script */
-#ifndef TOLUA_DISABLE_tolua_script_orxonox_Script_new00_local
-static int tolua_script_orxonox_Script_new00_local(lua_State* tolua_S)
-{
-#ifndef TOLUA_RELEASE
- tolua_Error tolua_err;
- if (
-     !tolua_isusertable(tolua_S,1,"orxonox::Script",0,&tolua_err) ||
-     !tolua_isnoobj(tolua_S,2,&tolua_err)
- )
-  goto tolua_lerror;
- else
-#endif
- {
-  {
-   orxonox::Script* tolua_ret = (orxonox::Script*)  Mtolua_new((orxonox::Script)());
-    tolua_pushusertype(tolua_S,(void*)tolua_ret,"orxonox::Script");
-    tolua_register_gc(tolua_S,lua_gettop(tolua_S));
-  }
- }
- return 1;
-#ifndef TOLUA_RELEASE
- tolua_lerror:
- tolua_error(tolua_S,"#ferror in function 'new'.",&tolua_err);
+ tolua_error(tolua_S,"#ferror in function 'getInstance'.",&tolua_err);
  return 0;
 #endif
@@ -92 +51 @@
 
 /* method: luaPrint of class  orxonox::Script */
-#ifndef TOLUA_DISABLE_tolua_script_orxonox_Script_luaPrint00
-static int tolua_script_orxonox_Script_luaPrint00(lua_State* tolua_S)
+#ifndef TOLUA_DISABLE_tolua_orxonox_orxonox_Script_luaPrint00
+static int tolua_orxonox_orxonox_Script_luaPrint00(lua_State* tolua_S)
 {
 #ifndef TOLUA_RELEASE
@@ -99 +58 @@
  if (
      !tolua_isusertype(tolua_S,1,"orxonox::Script",0,&tolua_err) ||
-     !tolua_isstring(tolua_S,2,0,&tolua_err) ||
+     !tolua_iscppstring(tolua_S,2,0,&tolua_err) ||
      !tolua_isnoobj(tolua_S,3,&tolua_err)
  )
@@ -107 +66 @@
  {
   orxonox::Script* self = (orxonox::Script*)  tolua_tousertype(tolua_S,1,0);
-  char* str = ((char*)  tolua_tostring(tolua_S,2,0));
+  std::string str = ((std::string)  tolua_tocppstring(tolua_S,2,0));
 #ifndef TOLUA_RELEASE
   if (!self) tolua_error(tolua_S,"invalid 'self' in function 'luaPrint'",NULL);
@@ -125 +84 @@
 
 /* Open function */
-TOLUA_API int tolua_script_open (lua_State* tolua_S)
+TOLUA_API int tolua_orxonox_open (lua_State* tolua_S)
 {
  tolua_open(tolua_S);
@@ -133 +92 @@
   tolua_module(tolua_S,"orxonox",0);
   tolua_beginmodule(tolua_S,"orxonox");
-   #ifdef __cplusplus
-   tolua_cclass(tolua_S,"Script","orxonox::Script","",tolua_collect_orxonox__Script);
-   #else
    tolua_cclass(tolua_S,"Script","orxonox::Script","",NULL);
-   #endif
    tolua_beginmodule(tolua_S,"Script");
-    tolua_function(tolua_S,"new",tolua_script_orxonox_Script_new00);
-    tolua_function(tolua_S,"new_local",tolua_script_orxonox_Script_new00_local);
-    tolua_function(tolua_S,".call",tolua_script_orxonox_Script_new00_local);
-    tolua_function(tolua_S,"luaPrint",tolua_script_orxonox_Script_luaPrint00);
+    tolua_function(tolua_S,"getInstance",tolua_orxonox_orxonox_Script_getInstance00);
+    tolua_function(tolua_S,"luaPrint",tolua_orxonox_orxonox_Script_luaPrint00);
    tolua_endmodule(tolua_S);
   tolua_endmodule(tolua_S);
@@ -151 +104 @@
 
 #if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501
- TOLUA_API int luaopen_script (lua_State* tolua_S) {
- return tolua_script_open(tolua_S);
+ TOLUA_API int luaopen_orxonox (lua_State* tolua_S) {
+ return tolua_orxonox_open(tolua_S);
 };
 #endif

code/branches/script/src/util/tolua/tolua_bind.h

@@ -1 +1 @@
 /*
-** Lua binding: script
-** Generated automatically by tolua++-1.0.92 on Sat Apr  5 20:29:18 2008.
+** Lua binding: orxonox
+** Generated automatically by tolua++-1.0.92 on Sun Apr  6 15:44:17 2008.
 */
 
 /* Exported function */
-TOLUA_API int  tolua_script_open (lua_State* tolua_S);
+TOLUA_API int  tolua_orxonox_open (lua_State* tolua_S);