Noise: Prevent unittest crash caused by division by zero

[oweals/minetest.git] / src / particles.h

diff --git a/src/particles.h b/src/particles.h
index 5464e66722c9a41dded0e62af1aa472958041fe4..13e73e861aaa94ed75dc820d47100cf72bcb57ce 100644 (file)
--- a/src/particles.h
+++ b/src/particles.h
@@ -20,8 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef PARTICLES_HEADER
 #define PARTICLES_HEADER
 
-#define DIGGING_PARTICLES_AMOUNT 10
-
 #include <iostream>
 #include "irrlichttypes_extrabloated.h"
 #include "client/tile.h"
@@ -32,13 +30,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 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,
@@ -53,7 +52,8 @@ class Particle : public scene::ISceneNode
                v2f texpos,
                v2f texsize,
                const struct TileAnimationParams &anim,
-               u8 glow
+               u8 glow,
+               video::SColor color = video::SColor(0xFFFFFFFF)
        );
        ~Particle();
 
@@ -85,7 +85,7 @@ private:
        void updateVertices();
 
        video::S3DVertex m_vertices[4];
-       float m_time;
+       float m_time = 0.0f;
        float m_expiration;
 
        ClientEnvironment *m_env;
@@ -100,14 +100,17 @@ private:
        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;
-       int m_animation_frame;
+       float m_animation_time = 0.0f;
+       int m_animation_frame = 0;
        u8 m_glow;
 };
 
@@ -115,7 +118,6 @@ class ParticleSpawner
 {
        public:
        ParticleSpawner(IGameDef* gamedef,
-               scene::ISceneManager *smgr,
                LocalPlayer *player,
                u16 amount,
                float time,
@@ -144,7 +146,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;
@@ -181,16 +182,16 @@ public:
        void step (float dtime);
 
        void handleParticleEvent(ClientEvent *event, Client *client,
-                       scene::ISceneManager* smgr, LocalPlayer *player);
+                       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);
@@ -206,8 +207,8 @@ private:
        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