Changeset 2026 for code/branches/objecthierarchy

Timestamp:

Oct 28, 2008, 3:06:23 PM (16 years ago)

Author:

landauf

Message:

lua include is now looking for files in the media directory

Location:

code/branches/objecthierarchy/src

Files:

• core/LuaBind.cc (modified) (1 diff)
• core/LuaBind.h (modified) (2 diffs)
• orxonox/Settings.cc (modified) (2 diffs)

code/branches/objecthierarchy/src/core/LuaBind.cc

@@ -123 +123 @@
       isRunning_ = true;
       int error = 0;
-      std::string init = "local scr = orxonox.LuaBind:getInstance()\nlocal debug = print\nprint = function(s)\nscr:luaPrint(s)\nend\ninclude = function(f)\nfile = io.open(f)\ncontent = file:read(\"*a\")\nfile:close()\nsource = scr:replaceLuaTags(content)\ndebug(source)\nassert(loadstring(source))()\nend\n";
+      std::string init = "local scr = orxonox.LuaBind:getInstance()\nlocal debug = print\nprint = function(s)\nscr:luaPrint(s)\nend\ninclude = function(f)\nfile = assert(io.open(\"" + this->includePath_ + "\"..\"/\"..f))\ncontent = file:read(\"*a\")\nfile:close()\nsource = scr:replaceLuaTags(content)\nassert(loadstring(source))()\nend\n";
       init += luaSource_;
   #if LUA_VERSION_NUM == 501

code/branches/objecthierarchy/src/core/LuaBind.h

@@ -79 +79 @@
     std::string replaceLuaTags(const std::string& text); // tolua_export
 
+    inline void setIncludePath(const std::string& includepath)
+        { this->includePath_ = includepath; }
+
     private:
       LuaBind();
@@ -87 +90 @@
       lua_State* luaState_;
       bool isRunning_;
+      std::string includePath_;
 
   }; // tolua_export

code/branches/objecthierarchy/src/orxonox/Settings.cc

@@ -39 +39 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/LuaBind.h"
 
 namespace orxonox
@@ -81 +82 @@
             COUT(2) << "Warning: Data path set to \"/\", is that really correct?" << std::endl;
         }
+
+        LuaBind::getInstance()->setIncludePath(this->dataPath_);
     }