mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Cleanup of particle & particlespawner structures and code (#9893)
This commit is contained in:
sfan5
GitHub
parent
1bcdc2d7e9
commit
1357ea1da2
11 changed files with 497 additions and 675 deletions
|
|
@ -32,56 +32,44 @@ int ModApiParticlesLocal::l_add_particle(lua_State *L)
|
|||
luaL_checktype(L, 1, LUA_TTABLE);
|
||||
|
||||
// Get parameters
|
||||
v3f pos, vel, acc;
|
||||
float expirationtime, size;
|
||||
bool collisiondetection, vertical, collision_removal;
|
||||
|
||||
struct TileAnimationParams animation;
|
||||
animation.type = TAT_NONE;
|
||||
|
||||
std::string texture;
|
||||
|
||||
u8 glow;
|
||||
ParticleParameters p;
|
||||
|
||||
lua_getfield(L, 1, "pos");
|
||||
pos = lua_istable(L, -1) ? check_v3f(L, -1) : v3f(0, 0, 0);
|
||||
if (lua_istable(L, -1))
|
||||
p.pos = check_v3f(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_getfield(L, 1, "velocity");
|
||||
vel = lua_istable(L, -1) ? check_v3f(L, -1) : v3f(0, 0, 0);
|
||||
if (lua_istable(L, -1))
|
||||
p.vel = check_v3f(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_getfield(L, 1, "acceleration");
|
||||
acc = lua_istable(L, -1) ? check_v3f(L, -1) : v3f(0, 0, 0);
|
||||
if (lua_istable(L, -1))
|
||||
p.acc = check_v3f(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
expirationtime = getfloatfield_default(L, 1, "expirationtime", 1);
|
||||
size = getfloatfield_default(L, 1, "size", 1);
|
||||
collisiondetection = getboolfield_default(L, 1, "collisiondetection", false);
|
||||
collision_removal = getboolfield_default(L, 1, "collision_removal", false);
|
||||
vertical = getboolfield_default(L, 1, "vertical", false);
|
||||
p.expirationtime = getfloatfield_default(L, 1, "expirationtime",
|
||||
p.expirationtime);
|
||||
p.size = getfloatfield_default(L, 1, "size", p.size);
|
||||
p.collisiondetection = getboolfield_default(L, 1,
|
||||
"collisiondetection", p.collisiondetection);
|
||||
p.collision_removal = getboolfield_default(L, 1,
|
||||
"collision_removal", p.collision_removal);
|
||||
p.object_collision = getboolfield_default(L, 1,
|
||||
"object_collision", p.object_collision);
|
||||
p.vertical = getboolfield_default(L, 1, "vertical", p.vertical);
|
||||
|
||||
lua_getfield(L, 1, "animation");
|
||||
animation = read_animation_definition(L, -1);
|
||||
p.animation = read_animation_definition(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
texture = getstringfield_default(L, 1, "texture", "");
|
||||
|
||||
glow = getintfield_default(L, 1, "glow", 0);
|
||||
p.texture = getstringfield_default(L, 1, "texture", p.texture);
|
||||
p.glow = getintfield_default(L, 1, "glow", p.glow);
|
||||
|
||||
ClientEvent *event = new ClientEvent();
|
||||
event->type = CE_SPAWN_PARTICLE;
|
||||
event->spawn_particle.pos = new v3f (pos);
|
||||
event->spawn_particle.vel = new v3f (vel);
|
||||
event->spawn_particle.acc = new v3f (acc);
|
||||
event->spawn_particle.expirationtime = expirationtime;
|
||||
event->spawn_particle.size = size;
|
||||
event->spawn_particle.collisiondetection = collisiondetection;
|
||||
event->spawn_particle.collision_removal = collision_removal;
|
||||
event->spawn_particle.vertical = vertical;
|
||||
event->spawn_particle.texture = new std::string(texture);
|
||||
event->spawn_particle.animation = animation;
|
||||
event->spawn_particle.glow = glow;
|
||||
event->type = CE_SPAWN_PARTICLE;
|
||||
event->spawn_particle = new ParticleParameters(p);
|
||||
getClient(L)->pushToEventQueue(event);
|
||||
|
||||
return 0;
|
||||
|
|
@ -90,94 +78,69 @@ int ModApiParticlesLocal::l_add_particle(lua_State *L)
|
|||
int ModApiParticlesLocal::l_add_particlespawner(lua_State *L)
|
||||
{
|
||||
luaL_checktype(L, 1, LUA_TTABLE);
|
||||
|
||||
// Get parameters
|
||||
u16 amount;
|
||||
v3f minpos, maxpos, minvel, maxvel, minacc, maxacc;
|
||||
float time, minexptime, maxexptime, minsize, maxsize;
|
||||
bool collisiondetection, vertical, collision_removal;
|
||||
ParticleSpawnerParameters p;
|
||||
|
||||
struct TileAnimationParams animation;
|
||||
animation.type = TAT_NONE;
|
||||
// TODO: Implement this when there is a way to get an objectref.
|
||||
// ServerActiveObject *attached = NULL;
|
||||
std::string texture;
|
||||
u8 glow;
|
||||
|
||||
amount = getintfield_default(L, 1, "amount", 1);
|
||||
time = getfloatfield_default(L, 1, "time", 1);
|
||||
p.amount = getintfield_default(L, 1, "amount", p.amount);
|
||||
p.time = getfloatfield_default(L, 1, "time", p.time);
|
||||
|
||||
lua_getfield(L, 1, "minpos");
|
||||
minpos = lua_istable(L, -1) ? check_v3f(L, -1) : v3f(0, 0, 0);
|
||||
if (lua_istable(L, -1))
|
||||
p.minpos = check_v3f(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_getfield(L, 1, "maxpos");
|
||||
maxpos = lua_istable(L, -1) ? check_v3f(L, -1) : v3f(0, 0, 0);
|
||||
if (lua_istable(L, -1))
|
||||
p.maxpos = check_v3f(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_getfield(L, 1, "minvel");
|
||||
minvel = lua_istable(L, -1) ? check_v3f(L, -1) : v3f(0, 0, 0);
|
||||
if (lua_istable(L, -1))
|
||||
p.minvel = check_v3f(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_getfield(L, 1, "maxvel");
|
||||
maxvel = lua_istable(L, -1) ? check_v3f(L, -1) : v3f(0, 0, 0);
|
||||
if (lua_istable(L, -1))
|
||||
p.maxvel = check_v3f(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_getfield(L, 1, "minacc");
|
||||
minacc = lua_istable(L, -1) ? check_v3f(L, -1) : v3f(0, 0, 0);
|
||||
if (lua_istable(L, -1))
|
||||
p.minacc = check_v3f(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_getfield(L, 1, "maxacc");
|
||||
maxacc = lua_istable(L, -1) ? check_v3f(L, -1) : v3f(0, 0, 0);
|
||||
if (lua_istable(L, -1))
|
||||
p.maxacc = check_v3f(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
minexptime = getfloatfield_default(L, 1, "minexptime", 1);
|
||||
maxexptime = getfloatfield_default(L, 1, "maxexptime", 1);
|
||||
minsize = getfloatfield_default(L, 1, "minsize", 1);
|
||||
maxsize = getfloatfield_default(L, 1, "maxsize", 1);
|
||||
|
||||
collisiondetection = getboolfield_default(L, 1, "collisiondetection", false);
|
||||
collision_removal = getboolfield_default(L, 1, "collision_removal", false);
|
||||
vertical = getboolfield_default(L, 1, "vertical", false);
|
||||
p.minexptime = getfloatfield_default(L, 1, "minexptime", p.minexptime);
|
||||
p.maxexptime = getfloatfield_default(L, 1, "maxexptime", p.maxexptime);
|
||||
p.minsize = getfloatfield_default(L, 1, "minsize", p.minsize);
|
||||
p.maxsize = getfloatfield_default(L, 1, "maxsize", p.maxsize);
|
||||
p.collisiondetection = getboolfield_default(L, 1,
|
||||
"collisiondetection", p.collisiondetection);
|
||||
p.collision_removal = getboolfield_default(L, 1,
|
||||
"collision_removal", p.collision_removal);
|
||||
p.object_collision = getboolfield_default(L, 1,
|
||||
"object_collision", p.object_collision);
|
||||
|
||||
lua_getfield(L, 1, "animation");
|
||||
animation = read_animation_definition(L, -1);
|
||||
p.animation = read_animation_definition(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
// TODO: Implement this when a way to get an objectref on the client is added
|
||||
// lua_getfield(L, 1, "attached");
|
||||
// if (!lua_isnil(L, -1)) {
|
||||
// ObjectRef *ref = ObjectRef::checkobject(L, -1);
|
||||
// lua_pop(L, 1);
|
||||
// attached = ObjectRef::getobject(ref);
|
||||
// }
|
||||
|
||||
texture = getstringfield_default(L, 1, "texture", "");
|
||||
glow = getintfield_default(L, 1, "glow", 0);
|
||||
p.vertical = getboolfield_default(L, 1, "vertical", p.vertical);
|
||||
p.texture = getstringfield_default(L, 1, "texture", p.texture);
|
||||
p.glow = getintfield_default(L, 1, "glow", p.glow);
|
||||
|
||||
u64 id = getClient(L)->getParticleManager()->generateSpawnerId();
|
||||
|
||||
auto event = new ClientEvent();
|
||||
event->type = CE_ADD_PARTICLESPAWNER;
|
||||
event->add_particlespawner.amount = amount;
|
||||
event->add_particlespawner.spawntime = time;
|
||||
event->add_particlespawner.minpos = new v3f (minpos);
|
||||
event->add_particlespawner.maxpos = new v3f (maxpos);
|
||||
event->add_particlespawner.minvel = new v3f (minvel);
|
||||
event->add_particlespawner.maxvel = new v3f (maxvel);
|
||||
event->add_particlespawner.minacc = new v3f (minacc);
|
||||
event->add_particlespawner.maxacc = new v3f (maxacc);
|
||||
event->add_particlespawner.minexptime = minexptime;
|
||||
event->add_particlespawner.maxexptime = maxexptime;
|
||||
event->add_particlespawner.minsize = minsize;
|
||||
event->add_particlespawner.maxsize = maxsize;
|
||||
event->add_particlespawner.collisiondetection = collisiondetection;
|
||||
event->add_particlespawner.collision_removal = collision_removal;
|
||||
event->add_particlespawner.attached_id = 0;
|
||||
event->add_particlespawner.vertical = vertical;
|
||||
event->add_particlespawner.texture = new std::string(texture);
|
||||
event->add_particlespawner.id = id;
|
||||
event->add_particlespawner.animation = animation;
|
||||
event->add_particlespawner.glow = glow;
|
||||
event->type = CE_ADD_PARTICLESPAWNER;
|
||||
event->add_particlespawner.p = new ParticleSpawnerParameters(p);
|
||||
event->add_particlespawner.attached_id = 0;
|
||||
event->add_particlespawner.id = id;
|
||||
|
||||
getClient(L)->pushToEventQueue(event);
|
||||
lua_pushnumber(L, id);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue