Changeset 1132 for code/branches/network2/src/core

Timestamp:

Apr 22, 2008, 4:25:54 PM (16 years ago)

Author:

scheusso

Message:

and here come the other files

Location:

code/branches/network2/src/core

Files:

• CMakeLists.txt (modified) (2 diffs)
• ConfigFileManager.h (modified) (1 diff)
• Loader.cc (modified) (2 diffs)
• Script.cc (modified) (3 diffs)
• Script.h (modified) (2 diffs)
• tolua (deleted)

code/branches/network2/src/core/CMakeLists.txt

@@ -1 @@
-#get the created files
-AUX_SOURCE_DIRECTORY(tolua TOLUA_BIND_FILES) 
-
-SET( CORE_SRC_FILES
+SET(CORE_SRC_FILES
   OrxonoxClass.cc
   BaseObject.cc
@@ -29 +26 @@
   Tickable.cc
   Script.cc
-  ${TOLUA_BIND_FILES}
 )
 
-ADD_LIBRARY( core SHARED ${CORE_SRC_FILES})
+ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
 
-TARGET_LINK_LIBRARIES( core
+TARGET_LINK_LIBRARIES(core
   util
+  tolualib
   ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
   ${OIS_LIBRARIES}
 )

code/branches/network2/src/core/ConfigFileManager.h

@@ -63 +63 @@
     {
         public:
+            virtual ~ConfigFileEntry() {};
             virtual void setValue(const std::string& value) = 0;
             virtual std::string getValue() const = 0;

code/branches/network2/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/branches/network2/src/core/Script.cc

@@ -39 +39 @@
 }
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 #include "tolua/tolua_bind.h"
 
@@ -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/branches/network2/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