Mercurial > love-experiments
diff src/modules/graphics/opengl/wrap_ParticleSystem.cpp @ 1127:13e6ca38c28c
Fix issue #437: Area-based particle spawn.
New particles are spawned around the particle emitter position according to a
configurabe distribution.
New functionality:
particlesystem:setAreaSpread(distributon, x, y)
distribution, x, y = particlesystem:getAreaSpread()
Where `distribution' is one of "none", "uniform", "normal".
`x' and `y' take different meaning based on the distribution:
* none: no area spread - particles spawned at emitter position.
* uniform: particle spawned at px,py in the rectangle around emitter
position ex,ey, i.e.:
ex - x < px < ex + x, ey - y < py < ey + y,
* normal: particle position drawn from a normal/gaussian distribution
with mean ex,ey and standard deviation x,y, i.e.:
px \in N(ex, x²), py \in N(ey, y²).
| author | vrld <vrld@vrld.org> |
|---|---|
| date | Mon, 10 Sep 2012 19:58:44 +0200 |
| parents | 86a44f2bc38f |
| children | bf8e12d0015f |
line wrap: on
line diff
--- a/src/modules/graphics/opengl/wrap_ParticleSystem.cpp Mon Sep 10 19:45:54 2012 +0200 +++ b/src/modules/graphics/opengl/wrap_ParticleSystem.cpp Mon Sep 10 19:58:44 2012 +0200 @@ -86,6 +86,24 @@ return 0; } +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); + + 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)"); + + t->setAreaSpread(distribution, x, y); + return 0; +} + int w_ParticleSystem_setDirection(lua_State *L) { ParticleSystem *t = luax_checkparticlesystem(L, 1); @@ -273,6 +291,21 @@ return 2; } +int w_ParticleSystem_getAreaSpread(lua_State *L) +{ + ParticleSystem *t = luax_checkparticlesystem(L, 1); + ParticleSystem::AreaSpreadDistribution distribution = t-> getAreaSpreadDistribution(); + const char *str; + ParticleSystem::getConstant(distribution, str); + const love::Vector &p = t->getAreaSpreadParameters(); + + lua_pushstring(L, str); + lua_pushnumber(L, p.x); + lua_pushnumber(L, p.y); + + return 3; +} + int w_ParticleSystem_getDirection(lua_State *L) { ParticleSystem *t = luax_checkparticlesystem(L, 1); @@ -373,6 +406,7 @@ { "setLifetime", w_ParticleSystem_setLifetime }, { "setParticleLife", w_ParticleSystem_setParticleLife }, { "setPosition", w_ParticleSystem_setPosition }, + { "setAreaSpread", w_ParticleSystem_setAreaSpread }, { "setDirection", w_ParticleSystem_setDirection }, { "setSpread", w_ParticleSystem_setSpread }, { "setRelativeDirection", w_ParticleSystem_setRelativeDirection }, @@ -390,6 +424,7 @@ { "getX", w_ParticleSystem_getX }, { "getY", w_ParticleSystem_getY }, { "getPosition", w_ParticleSystem_getPosition }, + { "getAreaSpread", w_ParticleSystem_getAreaSpread }, { "getDirection", w_ParticleSystem_getDirection }, { "getSpread", w_ParticleSystem_getSpread }, { "getOffsetX", w_ParticleSystem_getOffsetX },