Changeset 48 for cafu/trunk/CaWE/MapDocument.cpp

Timestamp:

04/13/10 17:06:34 (2 years ago)

Author:

Carsten

Message:

a) Changed the format of pts pointfiles to Lua. That is, pointfiles are now true, complete Lua programs:

• CaBSP has been updated to write pointfiles in the new format as Lua programs,
• CaWE has been updated to run pointfiles as Lua programs and to look into the generated Points table for the results.

b) Added a new recordPath() console function to the Cafu game client that allows recording the path of the player.

(This functionality has been asked for by Dennis Köhler from the FH Dortmund for running a new set of scientific tests.)
The recored paths are saved in the same pointfile format as those for leaks, and thus can uniformly be loaded into CaWE for visualization!

c) CaWE: Fixed occurrences of wxMessageBox(..., wxOK | wxICON_...) being called without the wxOK constant.

Some open issues for future consideration:
- Allow record-style initialization besides the existing list-style initialization.
- Support setting a custom line color in the pointfile.
- In CaWE, visualize not only the point coordinates, but also the time, heading, comments, ...

Example future pointfile:

Points=
{

-- color="blue", -- Any string that the wxColour() ctor recognizes.

-- Use record-style or list-style initialization.
{ 0; -1695, -498.692, -67.9358; 9874; "" },
{ 5.26625; -1697.05, -482.187, -67.9358; 64250; "" },
{ 5.77412; -1711.62, -364.583, -67.9358; 64250; "" },
{ t=6.30243; x=-1726.45, y=-243.117, z=-67.9358; hdg=64310; comment="" },
{ t=6.80414; -1740.28, -125.456, -43.9358; hdg=64640; "" }, -- mixed...

}

Files:

• cafu/trunk/CaWE/MapDocument.cpp (modified) (5 diffs)

cafu/trunk/CaWE/MapDocument.cpp

@@ -86 +86 @@
 #include "wx/numdlg.h"
 
+extern "C"
+{
+    #include <lua.h>
+    #include <lualib.h>
+    #include <lauxlib.h>
+}
+
 
 #if defined(_WIN32) && defined(_MSC_VER)
@@ -525 +532 @@
             wxMessageBox("Sorry, creating the backup file \""+FileName+"_bak\" before saving the map to \""+FileName+"\" didn't work out.\n"
                          "Please check the path and file permissions, "
-                         "or use 'File -> Save As...' to save the current map elsewhere.", "File not saved!", wxICON_ERROR);
+                         "or use 'File -> Save As...' to save the current map elsewhere.", "File not saved!", wxOK | wxICON_ERROR);
             return false;
         }
@@ -536 +543 @@
         {
             wxMessageBox("The file \""+FileName+"\" could not be opened for writing.\nPlease check the path and file permissions, "
-                         "or use 'File -> Save As...' to save the current map elsewhere.", "File not saved!", wxICON_ERROR);
+                         "or use 'File -> Save As...' to save the current map elsewhere.", "File not saved!", wxOK | wxICON_ERROR);
             return false;
         }
@@ -568 +575 @@
         if (OutFile.fail())
         {
-            wxMessageBox("There was an error when saving the file. Please try again.", "File not saved!", wxICON_ERROR);
+            wxMessageBox("There was an error when saving the file. Please try again.", "File not saved!", wxOK | wxICON_ERROR);
             return false;
         }
@@ -1176 +1183 @@
     }
 
-    if (!wxFileExists(PointFileName))
-    {
-        wxMessageBox("Couldn't load the pointfile.");
-        return;
-    }
-
-    TextParserT TP(PointFileName);
-
-    while (!TP.IsAtEOF())
-    {
-        const float x=TP.GetNextTokenAsFloat(); if (TP.IsAtEOF()) break;
-        const float y=TP.GetNextTokenAsFloat(); if (TP.IsAtEOF()) break;
-        const float z=TP.GetNextTokenAsFloat(); if (TP.IsAtEOF()) break;
-
-        m_PointFilePoints.PushBack(Vector3fT(x, y, z));
-    }
-
-    UpdateAllObservers(UPDATE_POINTFILE);
+
+    // Create a new Lua state.
+    lua_State* LuaState=lua_open();
+
+    try
+    {
+        if (LuaState==NULL) throw wxString("Couldn't open Lua state.");
+        if (!wxFileExists(PointFileName)) throw wxString("The file does not exist.");
+
+        lua_pushcfunction(LuaState, luaopen_base);    lua_pushstring(LuaState, "");              lua_call(LuaState, 1, 0);  // Opens the basic library.
+        lua_pushcfunction(LuaState, luaopen_package); lua_pushstring(LuaState, LUA_LOADLIBNAME); lua_call(LuaState, 1, 0);  // Opens the package library.
+        lua_pushcfunction(LuaState, luaopen_table);   lua_pushstring(LuaState, LUA_TABLIBNAME);  lua_call(LuaState, 1, 0);  // Opens the table library.
+        lua_pushcfunction(LuaState, luaopen_io);      lua_pushstring(LuaState, LUA_IOLIBNAME);   lua_call(LuaState, 1, 0);  // Opens the I/O library.
+        lua_pushcfunction(LuaState, luaopen_os);      lua_pushstring(LuaState, LUA_OSLIBNAME);   lua_call(LuaState, 1, 0);  // Opens the OS library.
+        lua_pushcfunction(LuaState, luaopen_string);  lua_pushstring(LuaState, LUA_STRLIBNAME);  lua_call(LuaState, 1, 0);  // Opens the string lib.
+        lua_pushcfunction(LuaState, luaopen_math);    lua_pushstring(LuaState, LUA_MATHLIBNAME); lua_call(LuaState, 1, 0);  // Opens the math lib.
+
+        // Load and process the Lua script file with the entity class definitions.
+        if (luaL_loadfile(LuaState, PointFileName.c_str())!=0 || lua_pcall(LuaState, 0, 0, 0)!=0)
+            throw wxString("Couldn't load the file:\n")+lua_tostring(LuaState, -1);
+
+        wxASSERT(lua_gettop(LuaState)==0);
+        m_PointFilePoints.Clear();
+        lua_getglobal(LuaState, "Points");
+        const size_t NumPoints=lua_objlen(LuaState, 1);
+
+        for (size_t PointNr=1; PointNr<=NumPoints; PointNr++)
+        {
+            // Put that table of the current point onto the stack (at index 2).
+            lua_rawgeti(LuaState, 1, PointNr);
+            m_PointFilePoints.PushBackEmpty();
+
+            for (size_t i=2; i<=4; i++)
+            {
+                lua_rawgeti(LuaState, 2, i);
+                m_PointFilePoints[PointNr-1][i-2]=lua_tonumber(LuaState, 3);
+                lua_pop(LuaState, 1);
+            }
+
+            // Remove the processed points table from the stack again.
+            lua_pop(LuaState, 1);
+        }
+
+        wxASSERT(lua_gettop(LuaState)==1);
+        lua_pop(LuaState, 1);
+
+        UpdateAllObservers(UPDATE_POINTFILE);
+    }
+    catch (const wxString& msg)
+    {
+        wxMessageBox(msg, "Error loading "+PointFileName, wxOK | wxICON_ERROR);
+    }
+
+    // Close the Lua state.
+    if (LuaState) lua_close(LuaState);
 }