WallyHackenslacker/lovedos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed default font to be real lua object

Browse Source 
The default font is now created as a real lua object and added to the
lua registry under the address of its struct pointer. The
love.graphics.getFont() function can now be used to retrieve the default
font.
This commit is contained in:
rxi
2014-06-14 15:40:39 +01:00
parent 2d48b5eae1
commit fb2622bd81
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/graphics.c
View File

@@ -19,20 +19,18 @@ image_t *graphics_canvas = &graphics_screen;
pixel_t graphics_backgroundColor = 0x0; pixel_t graphics_backgroundColor = 0x0;
pixel_t graphics_color = 0xf; pixel_t graphics_color = 0xf;
int graphics_blendMode = IMAGE_NORMAL; int graphics_blendMode = IMAGE_NORMAL;
font_t graphics_defaultFont; font_t *graphics_defaultFont;
font_t *graphics_font = &graphics_defaultFont; font_t *graphics_font;
int graphics_flip = 0; int graphics_flip = 0;
void graphics_init(void) { void graphics_init(void) {
image_initBlank(&graphics_screen, VGA_WIDTH, VGA_HEIGHT); image_initBlank(&graphics_screen, VGA_WIDTH, VGA_HEIGHT);
font_initEmbedded(&graphics_defaultFont);
} }
void graphics_deinit(void) { void graphics_deinit(void) {
font_deinit(&graphics_defaultFont);
image_deinit(&graphics_screen); image_deinit(&graphics_screen);
} }
@@ -133,25 +131,29 @@ int l_graphics_getFont(lua_State *L) {
int l_graphics_setFont(lua_State *L) { int l_graphics_setFont(lua_State *L) {
font_t *oldFont = graphics_font; font_t *oldFont = graphics_font;
int argIdx = 1;
if (lua_isnoneornil(L, 1)) { if (lua_isnoneornil(L, 1)) {
/* If no arguments are given we use the default embedded font */ /* If no arguments are given we use the default embedded font, grab it
graphics_font = &graphics_defaultFont; * from the registry and get its index */
graphics_font = graphics_defaultFont;
lua_pushlightuserdata(L, &graphics_defaultFont);
lua_gettable(L, LUA_REGISTRYINDEX);
argIdx = lua_absindex(L, -1);
} else { } else {
/* Set argument font */ /* Set argument font */
font_t *font = luaobj_checkudata(L, 1, LUAOBJ_TYPE_FONT); graphics_font = luaobj_checkudata(L, 1, LUAOBJ_TYPE_FONT);
graphics_font = font;
/* Add new font to registry */
lua_pushlightuserdata(L, font);
lua_pushvalue(L, 1);
lua_settable(L, LUA_REGISTRYINDEX);
} }
/* Remove old font from registry. This is done after setting the new font so /* Remove old font from registry. This is done after we know the args are
* that the font can remain unchanged if an error occurs */ * so that the font remains unchanged if an error occurs */
if (graphics_font != oldFont) { if (oldFont) {
lua_pushlightuserdata(L, oldFont); lua_pushlightuserdata(L, oldFont);
lua_pushnil(L); lua_pushnil(L);
lua_settable(L, LUA_REGISTRYINDEX); lua_settable(L, LUA_REGISTRYINDEX);
} }
/* Add new font to registry */
lua_pushlightuserdata(L, graphics_font);
lua_pushvalue(L, argIdx);
lua_settable(L, LUA_REGISTRYINDEX);
return 0; return 0;
} }
@@ -464,5 +466,20 @@ int luaopen_graphics(lua_State *L) {
{ 0, 0 }, { 0, 0 },
}; };
luaL_newlib(L, reg); luaL_newlib(L, reg);
/* Init default font */
lua_pushcfunction(L, l_font_new);
lua_call(L, 0, 1);
graphics_defaultFont = luaobj_checkudata(L, -1, LUAOBJ_TYPE_FONT);
/* Add default font to registry */
lua_pushlightuserdata(L, &graphics_defaultFont);
lua_pushvalue(L, -2);
lua_settable(L, LUA_REGISTRYINDEX);
lua_pop(L, 1); /* Pop the Font object */
/* Set default font */
lua_pushcfunction(L, l_graphics_setFont);
lua_call(L, 0, 0);
return 1; return 1;
} }