Fix alpha for liquid nodes (#5494)

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

diff --git a/src/particles.h b/src/particles.h
index 2bc2e7bfa813200943a85001c5ee375de58b9fca..eaec1f0fa784a4d942bc973875f9d24c10e7e1c5 100644 (file)
--- a/src/particles.h
+++ b/src/particles.h
@@ -20,16 +20,18 @@ 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"
 #include "localplayer.h"
 #include "environment.h"
+#include "tileanimation.h"
 
 struct ClientEvent;
 class ParticleManager;
+class ClientEnvironment;
+struct MapNode;
+struct ContentFeatures;
 
 class Particle : public scene::ISceneNode
 {
@@ -45,14 +47,18 @@ 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();
 
-       virtual const core::aabbox3d<f32>& getBoundingBox() const
+       virtual const aabb3f &getBoundingBox() const
        {
                return m_box;
        }
@@ -85,8 +91,8 @@ private:
 
        ClientEnvironment *m_env;
        IGameDef *m_gamedef;
-       core::aabbox3d<f32> m_box;
-       core::aabbox3d<f32> m_collisionbox;
+       aabb3f m_box;
+       aabb3f m_collisionbox;
        video::SMaterial m_material;
        v2f m_texpos;
        v2f m_texsize;
@@ -95,10 +101,18 @@ 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;
+       u8 m_glow;
 };
 
 class ParticleSpawner
@@ -115,9 +129,12 @@ 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();
@@ -148,8 +165,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 +184,20 @@ public:
 
        void step (float dtime);
 
-       void handleParticleEvent(ClientEvent *event,IGameDef *gamedef,
+       void handleParticleEvent(ClientEvent *event, Client *client,
                        scene::ISceneManager* smgr, LocalPlayer *player);
 
        void addDiggingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
-               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+               LocalPlayer *player, v3s16 pos, const MapNode &n,
+               const ContentFeatures &f);
 
        void addPunchingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
-               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+               LocalPlayer *player, v3s16 pos, const MapNode &n,
+               const ContentFeatures &f);
 
        void addNodeParticle(IGameDef* gamedef, scene::ISceneManager* smgr,
-               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+               LocalPlayer *player, v3s16 pos, const MapNode &n,
+               const ContentFeatures &f);
 
 protected:
        void addParticle(Particle* toadd);
@@ -190,8 +213,8 @@ private:
        std::map<u32, ParticleSpawner*> m_particle_spawners;
 
        ClientEnvironment* m_env;
-       JMutex m_particle_list_lock;
-       JMutex m_spawner_list_lock;
+       Mutex m_particle_list_lock;
+       Mutex m_spawner_list_lock;
 };
 
 #endif