LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 20:49:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

ParticleSystem:setColors(r, g, b) now defaults to 255 alpha instead of erroring (resolves issue #686)

Browse Source
This commit is contained in:
Alex Szpakowski
2013-07-21 21:41:23 -03:00
parent bdb4c7eb90
commit 8408c276cb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_ParticleSystem.cpp
+2 -2
View File
@@ -512,7 +512,7 @@ int w_ParticleSystem_setColors(lua_State *L)
int cargs = lua_gettop(L) - 1; int cargs = lua_gettop(L) - 1;
size_t nColors = (cargs + 3) / 4; // nColors = ceil(color_args / 4) size_t nColors = (cargs + 3) / 4; // nColors = ceil(color_args / 4)
if (cargs % 4 != 0 || cargs == 0) if (cargs != 3 && (cargs % 4 != 0 || cargs == 0))
return luaL_error(L, "Expected red, green, blue, and alpha. Only got %d of 4 components.", cargs % 4); return luaL_error(L, "Expected red, green, blue, and alpha. Only got %d of 4 components.", cargs % 4);
if (nColors > 8) if (nColors > 8)
@@ -523,7 +523,7 @@ int w_ParticleSystem_setColors(lua_State *L)
int r = luaL_checkint(L, 2); int r = luaL_checkint(L, 2);
int g = luaL_checkint(L, 3); int g = luaL_checkint(L, 3);
int b = luaL_checkint(L, 4); int b = luaL_checkint(L, 4);
int a = luaL_checkint(L, 5); int a = luaL_optint(L, 5, 255);
t->setColor(Color(r,g,b,a)); t->setColor(Color(r,g,b,a));
} }
else else