diff options
Diffstat (limited to 'src/lua/modules/graphics/je_lua_texture_font.cpp')
| -rw-r--r-- | src/lua/modules/graphics/je_lua_texture_font.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lua/modules/graphics/je_lua_texture_font.cpp b/src/lua/modules/graphics/je_lua_texture_font.cpp index 58677eb..eee134c 100644 --- a/src/lua/modules/graphics/je_lua_texture_font.cpp +++ b/src/lua/modules/graphics/je_lua_texture_font.cpp @@ -1,4 +1,4 @@ -#include "common/je_lua_proxy.h" +#include "common/je_lua_object.h" #include "common/je_lua_common.h" #include "libjin/jin.h" @@ -17,15 +17,15 @@ namespace JinEngine LUA_IMPLEMENT int l_gc(lua_State* L) { - Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_TextureFont); - proxy->release(); + LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_TextureFont); + luaObj->release(); return 0; } /* typeset(Text | string, lineheight, spacing) */ LUA_IMPLEMENT int l_typeset(lua_State* L) { - Proxy* pxyTexFont = (Proxy*)luax_checktype(L, 1, Jin_Lua_TextureFont); + LuaObject* pxyTexFont = (LuaObject*)luax_checktype(L, 1, Jin_Lua_TextureFont); Shared<TextureFont>& shrTexFont = pxyTexFont->getShared<TextureFont>(); TextureFont* tf = pxyTexFont->getObject<TextureFont>(); int lineheight = luax_checkinteger(L, 3); @@ -40,13 +40,13 @@ namespace JinEngine } else if (luax_istype(L, 2, Jin_Lua_Text)) { - Proxy* p2 = (Proxy*)luax_checktype(L, 2, Jin_Lua_Text); + LuaObject* p2 = (LuaObject*)luax_checktype(L, 2, Jin_Lua_Text); Text* text = p2->getObject<Text>(); page = tf->typeset(*text, lineheight, spacing); } Shared<Page>* shrPage = new Shared<Page>(L, page, Jin_Lua_Page); shrPage->setDependency((int)PageDependency::DEP_TEXTURE_FONT, &shrTexFont); - Proxy* pxyPage = luax_newinstance(L, Jin_Lua_Page, shrPage); + LuaObject* pxyPage = luax_newinstance(L, Jin_Lua_Page, shrPage); return 1; } |