Changeset 1102 for code/trunk

Timestamp:

Apr 17, 2008, 3:40:12 PM (17 years ago)

Author:

bknecht

Message:

lua50 compatiple level code and loading, should work on tardis as well now

Location:

code/trunk

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/core/Loader.cc (modified) (2 diffs)
• src/core/Script.cc (modified) (2 diffs)
• src/core/Script.h (modified) (2 diffs)

code/trunk/bin/levels/sample.oxw

@@ -38 +38 @@
 
 
-<!--?lua
+<?lua
 for i = 1, 226, 1 
 do ?>
-  <Model position="<?lua print(math.random(-19597, 18732))?>, <?lua print(math.random(-19597, 18732)) ?>, <?lua print(math.random(-19597, 18732)) ?>" scale="<?lua print(math.random( 20, 119)) ?>" mesh="ast<?lua print(i%6 + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random(16, 44)) ?>" />
+  <Model position="<?lua print(math.random(-19597, 18732))?>, <?lua print(math.random(-19597, 18732)) ?>, <?lua print(math.random(-19597, 18732)) ?>" scale="<?lua print(math.random( 20, 119)) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random(16, 44)) ?>" />
 <?lua 
 end
-?-->
+?>

code/trunk/src/core/Loader.cc

@@ -115 +115 @@
         Script::init(Script::getLuaState());
         Script::run();*/
-        //Script* lua = Script::getInstance();
-        //lua->loadFile(level->getFile(), true);
-        //lua->run();
+        Script* lua = Script::getInstance();
+        lua->loadFile(level->getFile(), true);
+        lua->run();
 
         try
@@ -124 +124 @@
             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(lua->getLuaOutput(), true);
+            ticpp::Document xmlfile;
+            //xmlfile.ToDocument();
+            xmlfile.Parse(lua->getLuaOutput(), true);
 
             ticpp::Element rootElement;

code/trunk/src/core/Script.cc

@@ -102 +102 @@
   }
 
+#if LUA_VERSION_NUM != 501
+  const char * Script::lua_Chunkreader(lua_State *L, void *data, size_t *size)
+  {
+    LoadS* ls = ((LoadS*)data);
+    if (ls->size == 0) return NULL;
+    *size = ls->size;
+    ls->size = 0;
+    return ls->s;
+  }
+#endif
   void Script::run()
   {
@@ -110 +120 @@
     error = luaL_loadstring(luaState_, init.c_str());
 #else
-    error = lua_load(luaState_, &orxonox::Script::lua_Chunkreader, (void*)init.c_str(), "init");
+    LoadS ls;
+    ls.s = init.c_str();
+    ls.size = init.size();
+    error = lua_load(luaState_, &orxonox::Script::lua_Chunkreader, &ls, init.c_str());
 #endif
     if (error == 0)

code/trunk/src/core/Script.h

@@ -50 +50 @@
   class _CoreExport Script // tolua_export
   { // tolua_export
+    struct LoadS {
+      const char *s;
+      size_t size;
+    };
+
     public:
       inline static Script* getInstance() { if (!Script::singletonRef) Script::singletonRef = new Script(); return Script::singletonRef; } // tolua_export
@@ -61 +66 @@
 
 #if LUA_VERSION_NUM != 501
-    inline static const char * lua_Chunkreader(lua_State *L, void *data, size_t *size) { return NULL;};
+    static const char * lua_Chunkreader(lua_State *L, void *data, size_t *size);
 #endif