Fix a formspec crash triggered by ae9b5e00989756bb676429530dfe81039009001c

[minetest.git] / src / particles.h

diff --git a/src/particles.h b/src/particles.h
index dda84385c1bf49df9571b62823153b26506adf71..1956580452cf6f8f91c67608a57061d566dc6337 100644 (file)
--- a/src/particles.h
+++ b/src/particles.h
@@ -17,26 +17,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef PARTICLES_HEADER
-#define PARTICLES_HEADER
-
-#define DIGGING_PARTICLES_AMOUNT 10
+#pragma once
 
 #include <iostream>
 #include "irrlichttypes_extrabloated.h"
 #include "client/tile.h"
 #include "localplayer.h"
-#include "environment.h"
+#include "tileanimation.h"
 
 struct ClientEvent;
 class ParticleManager;
+class ClientEnvironment;
+struct MapNode;
+struct ContentFeatures;
 
 class Particle : public scene::ISceneNode
 {
        public:
        Particle(
                IGameDef* gamedef,
-               scene::ISceneManager* mgr,
                LocalPlayer *player,
                ClientEnvironment *env,
                v3f pos,
@@ -45,12 +44,16 @@ class Particle : public scene::ISceneNode
                float expirationtime,
                float size,
                bool collisiondetection,
+               bool collision_removal,
                bool vertical,
                video::ITexture *texture,
                v2f texpos,
-               v2f texsize
+               v2f texsize,
+               const struct TileAnimationParams &anim,
+               u8 glow,
+               video::SColor color = video::SColor(0xFFFFFFFF)
        );
-       ~Particle();
+       ~Particle() = default;
 
        virtual const aabb3f &getBoundingBox() const
        {
@@ -80,7 +83,7 @@ class Particle : public scene::ISceneNode
        void updateVertices();
 
        video::S3DVertex m_vertices[4];
-       float m_time;
+       float m_time = 0.0f;
        float m_expiration;
 
        ClientEnvironment *m_env;
@@ -95,17 +98,24 @@ class Particle : public scene::ISceneNode
        v3f m_acceleration;
        LocalPlayer *m_player;
        float m_size;
-       u8 m_light;
+       //! Color without lighting
+       video::SColor m_base_color;
+       //! Final rendered color
+       video::SColor m_color;
        bool m_collisiondetection;
+       bool m_collision_removal;
        bool m_vertical;
        v3s16 m_camera_offset;
+       struct TileAnimationParams m_animation;
+       float m_animation_time = 0.0f;
+       int m_animation_frame = 0;
+       u8 m_glow;
 };
 
 class ParticleSpawner
 {
        public:
        ParticleSpawner(IGameDef* gamedef,
-               scene::ISceneManager *smgr,
                LocalPlayer *player,
                u16 amount,
                float time,
@@ -115,12 +125,15 @@ class ParticleSpawner
                float minexptime, float maxexptime,
                float minsize, float maxsize,
                bool collisiondetection,
+               bool collision_removal,
+               u16 attached_id,
                bool vertical,
                video::ITexture *texture,
                u32 id,
+               const struct TileAnimationParams &anim, u8 glow,
                ParticleManager* p_manager);
 
-       ~ParticleSpawner();
+       ~ParticleSpawner() = default;
 
        void step(float dtime, ClientEnvironment *env);
 
@@ -131,7 +144,6 @@ class ParticleSpawner
        ParticleManager* m_particlemanager;
        float m_time;
        IGameDef *m_gamedef;
-       scene::ISceneManager *m_smgr;
        LocalPlayer *m_player;
        u16 m_amount;
        float m_spawntime;
@@ -148,8 +160,11 @@ class ParticleSpawner
        video::ITexture *m_texture;
        std::vector<float> m_spawntimes;
        bool m_collisiondetection;
+       bool m_collision_removal;
        bool m_vertical;
-
+       u16 m_attached_id;
+       struct TileAnimationParams m_animation;
+       u8 m_glow;
 };
 
 /**
@@ -164,17 +179,17 @@ friend class ParticleSpawner;
 
        void step (float dtime);
 
-       void handleParticleEvent(ClientEvent *event,IGameDef *gamedef,
-                       scene::ISceneManager* smgr, LocalPlayer *player);
+       void handleParticleEvent(ClientEvent *event, Client *client,
+                       LocalPlayer *player);
 
-       void addDiggingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
-               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+       void addDiggingParticles(IGameDef *gamedef, LocalPlayer *player, v3s16 pos,
+               const MapNode &n, const ContentFeatures &f);
 
-       void addPunchingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
-               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+       void addPunchingParticles(IGameDef *gamedef, LocalPlayer *player, v3s16 pos,
+               const MapNode &n, const ContentFeatures &f);
 
-       void addNodeParticle(IGameDef* gamedef, scene::ISceneManager* smgr,
-               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+       void addNodeParticle(IGameDef *gamedef, LocalPlayer *player, v3s16 pos,
+               const MapNode &n, const ContentFeatures &f);
 
 protected:
        void addParticle(Particle* toadd);
@@ -190,8 +205,6 @@ friend class ParticleSpawner;
        std::map<u32, ParticleSpawner*> m_particle_spawners;
 
        ClientEnvironment* m_env;
-       Mutex m_particle_list_lock;
-       Mutex m_spawner_list_lock;
+       std::mutex m_particle_list_lock;
+       std::mutex m_spawner_list_lock;
 };
-
-#endif