Changeset 918

Timestamp:

03/14/10 03:49:25 (5 months ago)

Author:

zoogie

Message:

Now using Luabind!

• The function "on_init" in the system environment is now part of the "Game" object (C++ peer: GamePeer), an instance of which is added to the environment as "game". So, instead of "on_init(...)" use "game:on_init(...)".
• The function "get_on_init" is not available yet.
• When executing callbacks we now use Script::Core::CallAndPrint() and handle exceptions to avoid a panic.
• There is a memory leak somewhere I'm tracking down. :)

Location:

trunk

Files:

• client/client.vcproj (modified) (4 diffs)
• client/Game2/GameApp.cpp (modified) (5 diffs)
• client/Game2/GameApp.h (modified) (2 diffs)
• client/Game2/GamePeer.cpp (added)
• client/Game2/GamePeer.h (added)
• client/Game2/SysConsole.cpp (modified) (4 diffs)
• client/Game2/SysConsole.h (modified) (3 diffs)
• include/config-win32.h (modified) (1 diff)

trunk/client/client.vcproj

@@ -69 +69 @@
                 Name="VCLinkerTool"
                 AdditionalOptions="/MACHINE:I386"
-                AdditionalDependencies="wsock32.lib winmm.lib version.lib comctl32.lib libcurld.lib LiteUnzip.lib intl.lib lua5.1D.lib OIS_d.lib"
+                AdditionalDependencies="wsock32.lib winmm.lib version.lib comctl32.lib libcurld.lib LiteUnzip.lib intl.lib lua5.1D.lib luabindD.lib OIS_d.lib"
                 OutputFile="..\Debug\HoverRace.exe"
                 SuppressStartupBanner="true"
@@ -152 +152 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="wsock32.lib winmm.lib version.lib comctl32.lib libcurl.lib LiteUnzip.lib intl.lib lua5.1.lib OIS.lib"
+                AdditionalDependencies="wsock32.lib winmm.lib version.lib comctl32.lib libcurl.lib LiteUnzip.lib intl.lib lua5.1.lib luabind.lib OIS.lib"
                 OutputFile=".\..\Release\HoverRace.exe"
                 LinkIncremental="1"
@@ -294 +294 @@
             </File>
             <File
+                RelativePath=".\Game2\GamePeer.cpp"
+                >
+            </File>
+            <File
+                RelativePath=".\Game2\GamePeer.h"
+                >
+            </File>
+            <File
                 RelativePath=".\Game2\HighConsole.cpp"
                 >
@@ -669 +677 @@
                         Description="$(InputFileName)"
                         CommandLine="copy &quot;$(InputPath)&quot; $(OutDir)&#x0D;&#x0A;"
+                        Outputs="$(OutDir)\$(InputFileName)"
+                    />
+                </FileConfiguration>
+            </File>
+            <File
+                RelativePath="..\lib\luabind.dll"
+                >
+                <FileConfiguration
+                    Name="Debug|Win32"
+                    ExcludedFromBuild="true"
+                    >
+                    <Tool
+                        Name="VCCustomBuildTool"
+                        Description="$(InputFileName)"
+                        CommandLine="copy &quot;$(InputPath)&quot; $(OutDir)"
+                        Outputs="$(OutDir)\$(InputFileName)"
+                    />
+                </FileConfiguration>
+                <FileConfiguration
+                    Name="Release|Win32"
+                    >
+                    <Tool
+                        Name="VCCustomBuildTool"
+                        Description="$(InputFileName)"
+                        CommandLine="copy &quot;$(InputPath)&quot; $(OutDir)"
+                        Outputs="$(OutDir)\$(InputFileName)"
+                    />
+                </FileConfiguration>
+            </File>
+            <File
+                RelativePath="..\lib\luabindD.dll"
+                >
+                <FileConfiguration
+                    Name="Debug|Win32"
+                    >
+                    <Tool
+                        Name="VCCustomBuildTool"
+                        Description="$(InputFileName)"
+                        CommandLine="copy &quot;$(InputPath)&quot; $(OutDir)"
+                        Outputs="$(OutDir)\$(InputFileName)"
+                    />
+                </FileConfiguration>
+                <FileConfiguration
+                    Name="Release|Win32"
+                    ExcludedFromBuild="true"
+                    >
+                    <Tool
+                        Name="VCCustomBuildTool"
+                        Description="$(InputFileName)"
+                        CommandLine="copy &quot;$(InputPath)&quot; $(OutDir)"
                         Outputs="$(OutDir)\$(InputFileName)"
                     />

trunk/client/Game2/GameApp.cpp

@@ -28 +28 @@
 #include "FirstChoiceDialog.h"
 #include "FullscreenTest.h"
+#include "GamePeer.h"
 #include "Controller.h"
 #include "resource.h"
@@ -570 +571 @@
 
 MR_GameApp::MR_GameApp(HINSTANCE pInstance, bool safeMode) :
-    introMovie(NULL), scripting(NULL), sysConsole(NULL)
+    introMovie(NULL), scripting(NULL), gamePeer(NULL), sysConsole(NULL)
 {
     This = this;
@@ -613 +614 @@
         delete sysConsole;
         sysConsole = NULL;
+    }
+    if (gamePeer != NULL) {
+        delete gamePeer;
+        gamePeer = NULL;
     }
     if (scripting != NULL) {
@@ -1142 +1147 @@
     // This allows the script to modify the configuration (e.g. for unit tests).
     scripting = new Script::Core();
-    sysConsole = new SysConsole(scripting);
+    GamePeer::Register(scripting);
+    gamePeer = new GamePeer(scripting);
+    sysConsole = new SysConsole(scripting, gamePeer);
     if (!initScript.empty()) {
         sysConsole->RunScript(initScript);
@@ -2007 +2014 @@
          */
         case MR_WM_ON_INIT:
-            This->sysConsole->OnInit();
+            This->gamePeer->OnInit();
             break;
 

trunk/client/Game2/GameApp.h

@@ -32 +32 @@
     namespace Client {
         class FullscreenTest;
+        class GamePeer;
         class HighConsole;
         class IntroMovie;
@@ -87 +88 @@
         HoverRace::Client::FullscreenTest *fullscreenTest;
         HoverRace::Script::Core *scripting;
+        HoverRace::Client::GamePeer *gamePeer;
         HoverRace::Client::SysConsole *sysConsole;
         MR_ClientSession *mCurrentSession;

trunk/client/Game2/SysConsole.cpp

@@ -28 +28 @@
 #include <boost/filesystem/fstream.hpp>
 #include <boost/format.hpp>
+
+#include <luabind/luabind.hpp>
+
+#include "GamePeer.h"
 
 #include "SysConsole.h"
@@ -68 +72 @@
 namespace Client {
 
-SysConsole::SysConsole(Script::Core *scripting) :
-    SUPER(scripting), outHandle(scripting->AddOutput(boost::make_shared<LogStream>()))
+SysConsole::SysConsole(Script::Core *scripting, GamePeer *gamePeer) :
+    SUPER(scripting), gamePeer(gamePeer),
+    outHandle(scripting->AddOutput(boost::make_shared<LogStream>()))
 {
-    lua_State *state = scripting->GetState();
-
-    scripting->PrintStack();
-
-    // Initial table for callbacks.
-    lua_newtable(state);
-    onInitRef = luaL_ref(scripting->GetState(), LUA_REGISTRYINDEX);
 }
 
 SysConsole::~SysConsole()
 {
-    Script::Core *scripting = GetScripting();
-    luaL_unref(scripting->GetState(), LUA_REGISTRYINDEX, onInitRef);
-    scripting->RemoveOutput(outHandle);
+    GetScripting()->RemoveOutput(outHandle);
 }
 
 void SysConsole::InitEnv()
 {
+    using namespace luabind;
+
     Script::Core *scripting = GetScripting();
-    lua_State *state = scripting->GetState();
+    lua_State *L = scripting->GetState();
 
     // Start with the standard global environment.
     CopyGlobals();
 
+    object env(from_stack(L, -1));
+    env["game"] = gamePeer;
+
+    /*
     lua_pushlightuserdata(state, this);  // table this
     lua_pushcclosure(state, SysConsole::LOnInit, 1);  // table fn
@@ -106 +108 @@
     lua_insert(state, -2);  // table str fn
     lua_rawset(state, -3);  // table
+    */
 }
 
@@ -152 +155 @@
 }
 
-/**
- * Executes all "on_init" callbacks.
- */
-void SysConsole::OnInit()
-{
-    lua_State *state = GetScripting()->GetState();
-
-    lua_rawgeti(state, LUA_REGISTRYINDEX, onInitRef);  // table
-
-    lua_pushnil(state);  // table nil
-    while (lua_next(state, -2) != 0) {
-        // table key fn
-        lua_call(state, 0, 0);  // table key
-    }
-    // table
-    lua_pop(state, 1);
-}
-
-int SysConsole::LOnInit(lua_State *state)
-{
-    // function on_init(f)
-    // Register a callback function for when the game starts up.
-    SysConsole *self = static_cast<SysConsole*>(lua_touserdata(state, lua_upvalueindex(1)));
-
-    if (!lua_isfunction(state, 1)) {
-        lua_pushstring(state, "on_init requires a function.");
-        return lua_error(state);
-    }
-
-    lua_rawgeti(state, LUA_REGISTRYINDEX, self->onInitRef);  // table
-
-    lua_pushinteger(state, lua_objlen(state, -1) + 1); // table key
-    lua_pushvalue(state, 1); // table key fn
-    lua_settable(state, -3); // table
-
-    lua_pop(state, 1);
-
-    return 0;
-}
-
-int SysConsole::LGetOnInit(lua_State *state)
-{
-    // function get_on_init()
-    // Returns the table of on_init callbacks (for debugging purposes).
-    SysConsole *self = static_cast<SysConsole*>(lua_touserdata(state, lua_upvalueindex(1)));
-
-    lua_rawgeti(state, LUA_REGISTRYINDEX, self->onInitRef);  // table
-
-    return 1;
-}
-
 }  // namespace Client
 }  // namespace HoverRace

trunk/client/Game2/SysConsole.h

@@ -27 +27 @@
 
 namespace HoverRace {
+    namespace Client {
+        class GamePeer;
+    }
     namespace Script {
         class Core;
@@ -40 +43 @@
 
     public:
-        SysConsole(Script::Core *scripting);
+        SysConsole(Script::Core *scripting, GamePeer *gamePeer);
         virtual ~SysConsole();
 
@@ -53 +56 @@
         void RunScript(const std::string &filename);
 
-    public:
-        void OnInit();
-
     private:
-        static int LOnInit(lua_State *state);
-        static int LGetOnInit(lua_State *state);
-
-    private:
+        GamePeer *gamePeer;
         Script::Core::OutHandle outHandle;
-        int onInitRef;
 };
 

trunk/include/config-win32.h

@@ -16 +16 @@
 #define HAVE_LUA 1
 
+#define HAVE_LUABIND 1
+#define LUABIND_DYNAMIC_LINK 1
+
 // Only enable DirectShow support if a recent Windows SDK is installed.
 #if defined(VER_PRODUCTBUILD) && VER_PRODUCTBUILD >= 6001