Changeset 6625

Timestamp:

Mar 28, 2010, 3:21:44 PM (14 years ago)

Author:

rgrieder

Message:

Lua debugger working perfectly by supplying the fully qualified filename to the lua_load function.
Usage: write pause(message) to any line in your lua code and a self explaining command line debugger will open in the console.
Important note: Turn off the IOConsole (—noIOConsole) or the lua debugger will not work!!!

Location:

code/branches/gamestate/src/libraries/core

Files:

• LuaState.cc (modified) (2 diffs)
• Resource.cc (modified) (2 diffs)
• Resource.h (modified) (1 diff)

code/branches/gamestate/src/libraries/core/LuaState.cc

@@ -134 +134 @@
             sourceFileInfo_ = sourceFileInfo;
 
+        std::string chunkname;
+        if (sourceFileInfo != NULL && !sourceFileInfo->fileSystemPath.empty())
+        {
+            // Provide lua_load with the filename for debug purposes
+            // The '@' is a Lua convention to identify the chunk name as filename
+            chunkname = '@' + sourceFileInfo->fileSystemPath;
+        }
+        else
+        {
+            // Use the beginning of the code string to identify the chunk
+            chunkname = code.substr(0, 80);
+        }
+
         int error = 0;
 #if LUA_VERSION_NUM != 501
@@ -139 +152 @@
         ls.s = code.c_str();
         ls.size = code.size();
-        error = lua_load(luaState_, &orxonox::LuaState::lua_Chunkreader, &ls, code.c_str());
+        error = lua_load(luaState_, &orxonox::LuaState::lua_Chunkreader, &ls, chunkname.c_str());
 #else
-        error = luaL_loadstring(luaState_, code.c_str());
+        error = luaL_loadbuffer(luaState_, code.c_str(), code.size(), chunkname.c_str());
 #endif
 

code/branches/gamestate/src/libraries/core/Resource.cc

@@ -29 +29 @@
 #include "Resource.h"
 
+#include <boost/filesystem/path.hpp>
 #include <OgreException.h>
+#include <OgreFileSystem.h>
 #include <OgreResourceGroupManager.h>
 
@@ -89 +91 @@
                 ptr->group = group;
                 ptr->size = it->uncompressedSize;
+                if (dynamic_cast<Ogre::FileSystemArchive*>(it->archive) != NULL)
+                {
+                    boost::filesystem::path base(it->archive->getName());
+                    base /= it->filename;
+                    ptr->fileSystemPath = base.string();
+                }
                 return ptr;
             }

code/branches/gamestate/src/libraries/core/Resource.h

@@ -57 +57 @@
         //! Uncompressed size
         size_t size;
+        //! Absolute file path ("" for files not on filesystem)
+        std::string fileSystemPath;
     };