Updated the Lua wrapper code for modules to account for cases where the module's instance is removed from memory completely and recreated during the program's lifetime.

This commit is contained in:
Alex Szpakowski
2014-07-21 14:52:01 -03:00
parent e87fbdcaaf
commit 014b9a46e5
45 changed files with 432 additions and 316 deletions
+6 -5
View File
@@ -32,7 +32,7 @@ namespace love
namespace image
{
static Image *instance = nullptr;
#define instance() (Module::getInstance<Image>(Module::M_IMAGE))
int w_newImageData(lua_State *L)
{
@@ -45,7 +45,7 @@ int w_newImageData(lua_State *L)
return luaL_error(L, "Invalid image size.");
ImageData *t = nullptr;
luax_catchexcept(L, [&](){ t = instance->newImageData(w, h); });
luax_catchexcept(L, [&](){ t = instance()->newImageData(w, h); });
luax_pushtype(L, "ImageData", IMAGE_IMAGE_DATA_T, t);
return 1;
@@ -56,7 +56,7 @@ int w_newImageData(lua_State *L)
ImageData *t = nullptr;
luax_catchexcept(L,
[&]() { t = instance->newImageData(data); },
[&]() { t = instance()->newImageData(data); },
[&]() { data->release(); }
);
@@ -70,7 +70,7 @@ int w_newCompressedData(lua_State *L)
CompressedData *t = nullptr;
luax_catchexcept(L,
[&]() { t = instance->newCompressedData(data); },
[&]() { t = instance()->newCompressedData(data); },
[&]() { data->release(); }
);
@@ -81,7 +81,7 @@ int w_newCompressedData(lua_State *L)
int w_isCompressed(lua_State *L)
{
love::filesystem::FileData *data = love::filesystem::luax_getfiledata(L, 1);
bool compressed = instance->isCompressed(data);
bool compressed = instance()->isCompressed(data);
data->release();
luax_pushboolean(L, compressed);
@@ -106,6 +106,7 @@ static const lua_CFunction types[] =
extern "C" int luaopen_love_image(lua_State *L)
{
Image *instance = instance();
if (instance == nullptr)
{
luax_catchexcept(L, [&](){ instance = new love::image::magpie::Image(); });