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

Removed set/getFlip from graphics, added flip param to graphics.draw()

Browse Source
This commit is contained in:
rxi
2017-01-13 21:44:11 +00:00
parent 4063c335d3
commit 3408f341c3
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/l_graphics.c
View File

@@ -25,7 +25,6 @@ int graphics_backgroundColor_rgb[3];
pixel_t graphics_color; pixel_t graphics_color;
int graphics_color_rgb[3]; int graphics_color_rgb[3];
int graphics_blendMode; int graphics_blendMode;
int graphics_flip;
static int getColorFromArgs(lua_State *L, int *rgb, const int *def) { static int getColorFromArgs(lua_State *L, int *rgb, const int *def) {
@@ -206,19 +205,6 @@ int l_graphics_setCanvas(lua_State *L) {
} }
int l_graphics_getFlip(lua_State *L) {
lua_pushboolean(L, graphics_flip);
return 1;
}
int l_graphics_setFlip(lua_State *L) {
int x = lua_isnoneornil(L, 1) ? 0 : lua_toboolean(L, 1);
image_setFlip(x);
return 0;
}
int l_graphics_reset(lua_State *L) { int l_graphics_reset(lua_State *L) {
int (*funcs[])(lua_State*) = { int (*funcs[])(lua_State*) = {
l_graphics_setBackgroundColor, l_graphics_setBackgroundColor,
@@ -226,7 +212,6 @@ int l_graphics_reset(lua_State *L) {
l_graphics_setBlendMode, l_graphics_setBlendMode,
l_graphics_setFont, l_graphics_setFont,
l_graphics_setCanvas, l_graphics_setCanvas,
l_graphics_setFlip,
NULL, NULL,
}; };
int i; int i;
@@ -255,18 +240,21 @@ int l_graphics_present(lua_State *L) {
int l_graphics_draw(lua_State *L) { int l_graphics_draw(lua_State *L) {
image_t *img = luaobj_checkudata(L, 1, LUAOBJ_TYPE_IMAGE); image_t *img = luaobj_checkudata(L, 1, LUAOBJ_TYPE_IMAGE);
quad_t *quad = NULL; quad_t *quad = NULL;
int x, y; int x, y, flip;
if (!lua_isnone(L, 2) && lua_type(L, 2) != LUA_TNUMBER) { if (!lua_isnone(L, 2) && lua_type(L, 2) != LUA_TNUMBER) {
quad = luaobj_checkudata(L, 2, LUAOBJ_TYPE_QUAD); quad = luaobj_checkudata(L, 2, LUAOBJ_TYPE_QUAD);
x = luaL_optnumber(L, 3, 0); x = luaL_optnumber(L, 3, 0);
y = luaL_optnumber(L, 4, 0); y = luaL_optnumber(L, 4, 0);
flip = !lua_isnone(L, 5) && lua_toboolean(L, 5);
} else { } else {
x = luaL_optnumber(L, 2, 0); x = luaL_optnumber(L, 2, 0);
y = luaL_optnumber(L, 3, 0); y = luaL_optnumber(L, 3, 0);
flip = !lua_isnone(L, 4) && lua_toboolean(L, 4);
} }
pixel_t *buf = graphics_canvas->data; pixel_t *buf = graphics_canvas->data;
int bufw = graphics_canvas->width; int bufw = graphics_canvas->width;
int bufh = graphics_canvas->height; int bufh = graphics_canvas->height;
image_setFlip(flip);
if (quad) { if (quad) {
image_blit(img, buf, bufw, bufh, x, y, image_blit(img, buf, bufw, bufh, x, y,
quad->x, quad->y, quad->width, quad->height); quad->x, quad->y, quad->width, quad->height);
@@ -483,8 +471,6 @@ int luaopen_graphics(lua_State *L) {
{ "setFont", l_graphics_setFont }, { "setFont", l_graphics_setFont },
{ "getCanvas", l_graphics_getCanvas }, { "getCanvas", l_graphics_getCanvas },
{ "setCanvas", l_graphics_setCanvas }, { "setCanvas", l_graphics_setCanvas },
{ "getFlip", l_graphics_getFlip },
{ "setFlip", l_graphics_setFlip },
{ "reset", l_graphics_reset }, { "reset", l_graphics_reset },
{ "clear", l_graphics_clear }, { "clear", l_graphics_clear },
{ "present", l_graphics_present }, { "present", l_graphics_present },