From 1161e1d8be014945266017cb0ce735537a287677 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 3 May 2017 20:37:59 +0200 Subject: Truetype fonts --- src/sysbin/lx/lxdrawlib.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'src/sysbin/lx/lxdrawlib.c') diff --git a/src/sysbin/lx/lxdrawlib.c b/src/sysbin/lx/lxdrawlib.c index 68da1d6..22c6a3b 100644 --- a/src/sysbin/lx/lxdrawlib.c +++ b/src/sysbin/lx/lxdrawlib.c @@ -41,9 +41,26 @@ typedef struct { // ==================================================================== // FONTS -static int draw_loadfont(lua_State *L) { +static int draw_load_bitmap_font(lua_State *L) { const char* name = luaL_checkstring(L, 1); - font_t *f = g_load_font(name); + font_t *f = g_load_ascii_bitmap_font(name); + if (f == NULL) { + lua_pushnil(L); + return 1; + } + + drawlib_font *ff = (drawlib_font*)lua_newuserdata(L, sizeof(drawlib_font)); + luaL_getmetatable(L, FONT); + lua_setmetatable(L, -2); + + ff->font = f; + + return 1; +} + +static int draw_load_ttf_font(lua_State *L) { + const char* name = luaL_checkstring(L, 1); + font_t *f = g_load_ttf_font(name); if (f == NULL) { lua_pushnil(L); return 1; @@ -384,10 +401,11 @@ static int surface_write(lua_State *L) { int y = luaL_checkinteger(L, 3); const char *text = luaL_checkstring(L, 4); drawlib_font *f = (drawlib_font*)luaL_checkudata(L, 5, FONT); - color_t c = (color_t)lx_checklightudata(L, 6); + int size = luaL_checkinteger(L, 6); + color_t c = (color_t)lx_checklightudata(L, 7); // TODO: relative to subregion! - g_write(s->fb, x, y, text, f->font, c); + g_write(s->fb, x, y, text, f->font, size, c); return 0; } @@ -397,7 +415,8 @@ static const luaL_Reg drawlib[] = { {"surface_from_fd",draw_surface_from_fd}, {"new_surface", draw_new_surface}, {"load_image", draw_load_image}, - {"load_font", draw_loadfont}, + {"load_bitmap_font",draw_load_bitmap_font}, + {"load_ttf_font",draw_load_ttf_font}, {NULL, NULL} }; -- cgit v1.2.3