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

Fixed ParticleSystem:setAreaSpread("none") to not require x/y arguments (resolves issue #738)

Browse Source
This commit is contained in:
Alex Szpakowski
2013-09-17 00:54:55 -03:00
parent eec2beffdd
commit 21d1e7737c
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+1 -1
View File
@@ -438,7 +438,7 @@ int w_newParticleSystem(lua_State *L)
Image *image = luax_checkimage(L, 1);
lua_Number size = luaL_optnumber(L, 2, 1000);
ParticleSystem *t = 0;
if (size < 1.0 || size > LOVE_UINT32_MAX)
if (size < 1.0 || size > ParticleSystem::MAX_PARTICLES)
return luaL_error(L, "Invalid ParticleSystem size");
EXCEPT_GUARD(t = instance->newParticleSystem(image, size);)
src/modules/graphics/opengl/wrap_ParticleSystem.cpp
+13 -8
View File
@@ -165,15 +165,20 @@ int w_ParticleSystem_setAreaSpread(lua_State *L)
{
ParticleSystem *t = luax_checkparticlesystem(L, 1);
ParticleSystem::AreaSpreadDistribution distribution;
const char *str = luaL_checkstring(L, 2);
if (!ParticleSystem::getConstant(str, distribution))
return luaL_error(L, "Invalid distribution: '%s'", str);
ParticleSystem::AreaSpreadDistribution distribution = ParticleSystem::DISTRIBUTION_NONE;
float x = 0.f, y = 0.f;
float x = (float)luaL_checknumber(L, 3);
float y = (float)luaL_checknumber(L, 4);
if (x < 0.0f || y < 0.0f)
return luaL_error(L, "Invalid area spread parameters (must be >= 0)");
const char *str = lua_isnoneornil(L, 2) ? 0 : luaL_checkstring(L, 2);
if (str && !ParticleSystem::getConstant(str, distribution))
return luaL_error(L, "Invalid particle distribution: %s", str);
if (distribution != ParticleSystem::DISTRIBUTION_NONE)
{
x = (float) luaL_checknumber(L, 3);
y = (float) luaL_checknumber(L, 4);
if (x < 0.0f || y < 0.0f)
return luaL_error(L, "Invalid area spread parameters (must be >= 0)");
}
t->setAreaSpread(distribution, x, y);
return 0;
src/modules/window/wrap_Window.cpp
+1 -1
View File
@@ -190,7 +190,7 @@ int w_setFullscreen(lua_State *L)
bool fullscreen = luax_toboolean(L, 1);
Window::FullscreenType fstype = Window::FULLSCREEN_TYPE_MAX_ENUM;
const char *typestr = lua_isnoneornil(L, 2) ? 0 : lua_tostring(L, 2);
const char *typestr = lua_isnoneornil(L, 2) ? 0 : luaL_checkstring(L, 2);
if (typestr && !Window::getConstant(typestr, fstype))
return luaL_error(L, "Invalid fullscreen type: %s", typestr);