Mercurial > love-experiments
diff src/modules/graphics/opengl/wrap_Graphics.cpp @ 1418:357697c2e2a8
More internal code cleanup
| author | Alex Szpakowski <slime73@gmail.com> |
|---|---|
| date | Sun, 31 Mar 2013 19:02:27 -0300 |
| parents | c70c9e4d10f3 |
| children | edd946442f86 |
line wrap: on
line diff
--- a/src/modules/graphics/opengl/wrap_Graphics.cpp Sun Mar 31 04:55:03 2013 -0300 +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp Sun Mar 31 19:02:27 2013 -0300 @@ -601,14 +601,14 @@ Color c; if (lua_istable(L, 1)) { - lua_rawgeti(L, 1, 1); - c.r = (unsigned char)luaL_checkint(L, -1); - lua_rawgeti(L, 1, 2); - c.g = (unsigned char)luaL_checkint(L, -1); - lua_rawgeti(L, 1, 3); - c.b = (unsigned char)luaL_checkint(L, -1); - lua_rawgeti(L, 1, 4); + for (int i = 1; i <= 4; i++) + lua_rawgeti(L, 1, i); + + c.r = (unsigned char)luaL_checkint(L, -4); + c.g = (unsigned char)luaL_checkint(L, -3); + c.b = (unsigned char)luaL_checkint(L, -2); c.a = (unsigned char)luaL_optint(L, -1, 255); + lua_pop(L, 4); } else @@ -637,14 +637,14 @@ Color c; if (lua_istable(L, 1)) { - lua_rawgeti(L, 1, 1); - c.r = (unsigned char)luaL_checkint(L, -1); - lua_rawgeti(L, 1, 2); - c.g = (unsigned char)luaL_checkint(L, -1); - lua_rawgeti(L, 1, 3); - c.b = (unsigned char)luaL_checkint(L, -1); - lua_rawgeti(L, 1, 4); + for (int i = 1; i <= 4; i++) + lua_rawgeti(L, 1, i); + + c.r = (unsigned char)luaL_checkint(L, -4); + c.g = (unsigned char)luaL_checkint(L, -3); + c.b = (unsigned char)luaL_checkint(L, -2); c.a = (unsigned char)luaL_optint(L, -1, 255); + lua_pop(L, 4); } else @@ -985,6 +985,7 @@ if (is_table) { + // grab the first canvas in the array and attach the rest lua_rawgeti(L, 1, 1); canvas = luax_checkcanvas(L, -1); lua_pop(L, 1);