Attachments: Fix interpolation from (0,0,0) after detach

[dragonfireclient.git] / src / script / lua_api / l_particles.cpp

diff --git a/src/script/lua_api/l_particles.cpp b/src/script/lua_api/l_particles.cpp
index 2532b2b08e8efe156e66cbba5ce35dedd29e0a02..340903ebf69b69d26f0d0213d4be497858a6b829 100644 (file)
--- a/src/script/lua_api/l_particles.cpp
+++ b/src/script/lua_api/l_particles.cpp
@@ -18,32 +18,41 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "lua_api/l_particles.h"
+#include "lua_api/l_object.h"
 #include "lua_api/l_internal.h"
 #include "common/c_converter.h"
+#include "common/c_content.h"
 #include "server.h"
+#include "client/particles.h"
 
 // add_particle({pos=, velocity=, acceleration=, expirationtime=,
-//             size=, collisiondetection=, vertical=, texture=, player=})
+//     size=, collisiondetection=, collision_removal=, object_collision=,
+//     vertical=, texture=, player=})
 // pos/velocity/acceleration = {x=num, y=num, z=num}
 // expirationtime = num (seconds)
 // size = num
 // collisiondetection = bool
+// collision_removal = bool
+// object_collision = bool
 // vertical = bool
 // texture = e.g."default_wood.png"
+// animation = TileAnimation definition
+// glow = num
 int ModApiParticles::l_add_particle(lua_State *L)
 {
+       MAP_LOCK_REQUIRED;
+
        // Get parameters
        v3f pos, vel, acc;
-       pos = vel = acc = v3f(0, 0, 0);
-
        float expirationtime, size;
        expirationtime = size = 1;
-
-       bool collisiondetection, vertical;
-       collisiondetection = vertical = false;
-
-       std::string texture = "";
-       std::string playername = "";
+       bool collisiondetection, vertical, collision_removal, object_collision;
+       collisiondetection = vertical = collision_removal = object_collision = false;
+       struct TileAnimationParams animation;
+       animation.type = TAT_NONE;
+       std::string texture;
+       std::string playername;
+       u8 glow = 0;
 
        if (lua_gettop(L) > 1) // deprecated
        {
@@ -53,7 +62,7 @@ int ModApiParticles::l_add_particle(lua_State *L)
                acc = check_v3f(L, 3);
                expirationtime = luaL_checknumber(L, 4);
                size = luaL_checknumber(L, 5);
-               collisiondetection = lua_toboolean(L, 6);
+               collisiondetection = readParam<bool>(L, 6);
                texture = luaL_checkstring(L, 7);
                if (lua_gettop(L) == 8) // only spawn for a single player
                        playername = luaL_checkstring(L, 8);
@@ -92,12 +101,24 @@ int ModApiParticles::l_add_particle(lua_State *L)
                size = getfloatfield_default(L, 1, "size", 1);
                collisiondetection = getboolfield_default(L, 1,
                        "collisiondetection", collisiondetection);
+               collision_removal = getboolfield_default(L, 1,
+                       "collision_removal", collision_removal);
+               object_collision = getboolfield_default(L, 1,
+                       "object_collision", object_collision);
                vertical = getboolfield_default(L, 1, "vertical", vertical);
+
+               lua_getfield(L, 1, "animation");
+               animation = read_animation_definition(L, -1);
+               lua_pop(L, 1);
+
                texture = getstringfield_default(L, 1, "texture", "");
                playername = getstringfield_default(L, 1, "playername", "");
+
+               glow = getintfield_default(L, 1, "glow", 0);
        }
-       getServer(L)->spawnParticle(playername, pos, vel, acc,
-                       expirationtime, size, collisiondetection, vertical, texture);
+       getServer(L)->spawnParticle(playername, pos, vel, acc, expirationtime, size,
+                       collisiondetection, collision_removal, object_collision, vertical,
+                       texture, animation, glow);
        return 1;
 }
 
@@ -108,6 +129,8 @@ int ModApiParticles::l_add_particle(lua_State *L)
 //                             minexptime=, maxexptime=,
 //                             minsize=, maxsize=,
 //                             collisiondetection=,
+//                             collision_removal=,
+//                             object_collision=,
 //                             vertical=,
 //                             texture=,
 //                             player=})
@@ -115,20 +138,29 @@ int ModApiParticles::l_add_particle(lua_State *L)
 // minexptime/maxexptime = num (seconds)
 // minsize/maxsize = num
 // collisiondetection = bool
+// collision_removal = bool
+// object_collision = bool
 // vertical = bool
 // texture = e.g."default_wood.png"
+// animation = TileAnimation definition
+// glow = num
 int ModApiParticles::l_add_particlespawner(lua_State *L)
 {
+       MAP_LOCK_REQUIRED;
+
        // Get parameters
        u16 amount = 1;
        v3f minpos, maxpos, minvel, maxvel, minacc, maxacc;
-           minpos= maxpos= minvel= maxvel= minacc= maxacc= v3f(0, 0, 0);
        float time, minexptime, maxexptime, minsize, maxsize;
-             time= minexptime= maxexptime= minsize= maxsize= 1;
-       bool collisiondetection, vertical;
-            collisiondetection= vertical= false;
-       std::string texture = "";
-       std::string playername = "";
+       time = minexptime = maxexptime = minsize = maxsize = 1;
+       bool collisiondetection, vertical, collision_removal, object_collision;
+       collisiondetection = vertical = collision_removal = object_collision = false;
+       struct TileAnimationParams animation;
+       animation.type = TAT_NONE;
+       ServerActiveObject *attached = NULL;
+       std::string texture;
+       std::string playername;
+       u8 glow = 0;
 
        if (lua_gettop(L) > 1) //deprecated
        {
@@ -145,7 +177,7 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
                maxexptime = luaL_checknumber(L, 10);
                minsize = luaL_checknumber(L, 11);
                maxsize = luaL_checknumber(L, 12);
-               collisiondetection = lua_toboolean(L, 13);
+               collisiondetection = readParam<bool>(L, 13);
                texture = luaL_checkstring(L, 14);
                if (lua_gettop(L) == 15) // only spawn for a single player
                        playername = luaL_checkstring(L, 15);
@@ -185,9 +217,26 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
                maxsize = getfloatfield_default(L, 1, "maxsize", maxsize);
                collisiondetection = getboolfield_default(L, 1,
                        "collisiondetection", collisiondetection);
+               collision_removal = getboolfield_default(L, 1,
+                       "collision_removal", collision_removal);
+               object_collision = getboolfield_default(L, 1,
+                       "object_collision", object_collision);
+
+               lua_getfield(L, 1, "animation");
+               animation = read_animation_definition(L, -1);
+               lua_pop(L, 1);
+
+               lua_getfield(L, 1, "attached");
+               if (!lua_isnil(L, -1)) {
+                       ObjectRef *ref = ObjectRef::checkobject(L, -1);
+                       lua_pop(L, 1);
+                       attached = ObjectRef::getobject(ref);
+               }
+
                vertical = getboolfield_default(L, 1, "vertical", vertical);
                texture = getstringfield_default(L, 1, "texture", "");
                playername = getstringfield_default(L, 1, "playername", "");
+               glow = getintfield_default(L, 1, "glow", 0);
        }
 
        u32 id = getServer(L)->addParticleSpawner(amount, time,
@@ -197,8 +246,12 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
                        minexptime, maxexptime,
                        minsize, maxsize,
                        collisiondetection,
+                       collision_removal,
+                       object_collision,
+                       attached,
                        vertical,
-                       texture, playername);
+                       texture, playername,
+                       animation, glow);
        lua_pushnumber(L, id);
 
        return 1;
@@ -208,9 +261,11 @@ int ModApiParticles::l_add_particlespawner(lua_State *L)
 // player (string) is optional
 int ModApiParticles::l_delete_particlespawner(lua_State *L)
 {
+       MAP_LOCK_REQUIRED;
+
        // Get parameters
        u32 id = luaL_checknumber(L, 1);
-       std::string playername = "";
+       std::string playername;
        if (lua_gettop(L) == 2) {
                playername = luaL_checkstring(L, 2);
        }