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 | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/lua/modules/graphics/je_lua_texture_font.cpp b/src/lua/modules/graphics/je_lua_texture_font.cpp index 8be9a9d..0c3c4d9 100644 --- a/src/lua/modules/graphics/je_lua_texture_font.cpp +++ b/src/lua/modules/graphics/je_lua_texture_font.cpp @@ -1,8 +1,10 @@ #include "lua/modules/luax.h" -#include "lua/modules/types.h" + #include "lua/common/je_lua_common.h" #include "libjin/jin.h" + #include "je_lua_page.h" +#include "je_lua_text.h" using namespace JinEngine::Graphics; using namespace JinEngine::Graphics::Fonts; @@ -12,9 +14,11 @@ namespace JinEngine namespace Lua { + const char* Jin_Lua_TextureFont = "TextureFont"; + LUA_IMPLEMENT int l_gc(lua_State* L) { - Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_TEXTUREFONT); + Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_TextureFont); proxy->release(); return 0; } @@ -22,7 +26,7 @@ namespace JinEngine /* typeset(Text | string, lineheight, spacing) */ LUA_IMPLEMENT int l_typeset(lua_State* L) { - Proxy* pxyTexFont = (Proxy*)luax_checktype(L, 1, JIN_GRAPHICS_TEXTUREFONT); + Proxy* pxyTexFont = (Proxy*)luax_checktype(L, 1, Jin_Lua_TextureFont); Shared<TextureFont>& shrTexFont = pxyTexFont->getShared<TextureFont>(); TextureFont* tf = pxyTexFont->getObject<TextureFont>(); int lineheight = luax_checkinteger(L, 3); @@ -35,14 +39,14 @@ namespace JinEngine Text text(Encode::UTF8, str, length); page = tf->typeset(text, lineheight, spacing); } - else if (luax_istype(L, 2, JIN_GRAPHICS_TEXT)) + else if (luax_istype(L, 2, Jin_Lua_Text)) { - Proxy* p2 = (Proxy*)luax_checktype(L, 2, JIN_GRAPHICS_TEXT); + Proxy* p2 = (Proxy*)luax_checktype(L, 2, Jin_Lua_Text); Text* text = p2->getObject<Text>(); page = tf->typeset(*text, lineheight, spacing); } - Proxy* pxyPage = luax_newinstance(L, JIN_GRAPHICS_PAGE); - Shared<Page>* shrPage = new Shared<Page>(page, JIN_GRAPHICS_PAGE); + Proxy* pxyPage = luax_newinstance(L, Jin_Lua_Page); + Shared<Page>* shrPage = new Shared<Page>(page, Jin_Lua_Page); shrPage->setDependency((int)PageDependency::DEP_TEXTURE_FONT, &shrTexFont); pxyPage->bind(shrPage); return 1; @@ -55,7 +59,7 @@ namespace JinEngine { "typeset", l_typeset }, { 0, 0 } }; - luax_newtype(L, JIN_GRAPHICS_TEXTUREFONT, f); + luax_newtype(L, Jin_Lua_TextureFont, f); return 0; } |