Make get_biome_list() error message more helpful

[minetest.git] / src / particles.h

diff --git a/src/particles.h b/src/particles.h
index 101fc49ce145cb8cb5a0bd72f8e8315318ec6543..2bc2e7bfa813200943a85001c5ee375de58b9fca 100644 (file)
--- a/src/particles.h
+++ b/src/particles.h
@@ -24,10 +24,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <iostream>
 #include "irrlichttypes_extrabloated.h"
-#include "tile.h"
+#include "client/tile.h"
 #include "localplayer.h"
 #include "environment.h"
 
+struct ClientEvent;
+class ParticleManager;
+
 class Particle : public scene::ISceneNode
 {
        public:
@@ -35,7 +38,7 @@ class Particle : public scene::ISceneNode
                IGameDef* gamedef,
                scene::ISceneManager* mgr,
                LocalPlayer *player,
-               ClientEnvironment &env,
+               ClientEnvironment *env,
                v3f pos,
                v3f velocity,
                v3f acceleration,
@@ -114,16 +117,18 @@ class ParticleSpawner
                bool collisiondetection,
                bool vertical,
                video::ITexture *texture,
-               u32 id);
+               u32 id,
+               ParticleManager* p_manager);
 
        ~ParticleSpawner();
 
-       void step(float dtime, ClientEnvironment &env);
+       void step(float dtime, ClientEnvironment *env);
 
        bool get_expired ()
        { return (m_amount <= 0) && m_spawntime != 0; }
 
        private:
+       ParticleManager* m_particlemanager;
        float m_time;
        IGameDef *m_gamedef;
        scene::ISceneManager *m_smgr;
@@ -144,24 +149,49 @@ class ParticleSpawner
        std::vector<float> m_spawntimes;
        bool m_collisiondetection;
        bool m_vertical;
+
 };
 
-void allparticles_step (float dtime);
-void allparticlespawners_step (float dtime, ClientEnvironment &env);
+/**
+ * Class doing particle as well as their spawners handling
+ */
+class ParticleManager
+{
+friend class ParticleSpawner;
+public:
+       ParticleManager(ClientEnvironment* env);
+       ~ParticleManager();
+
+       void step (float dtime);
+
+       void handleParticleEvent(ClientEvent *event,IGameDef *gamedef,
+                       scene::ISceneManager* smgr, LocalPlayer *player);
+
+       void addDiggingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
+               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
 
-void delete_particlespawner (u32 id);
-void clear_particles ();
+       void addPunchingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
+               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
 
-void addDiggingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
-       LocalPlayer *player, ClientEnvironment &env, v3s16 pos,
-       const TileSpec tiles[]);
+       void addNodeParticle(IGameDef* gamedef, scene::ISceneManager* smgr,
+               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
 
-void addPunchingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
-       LocalPlayer *player, ClientEnvironment &env, v3s16 pos,
-       const TileSpec tiles[]);
+protected:
+       void addParticle(Particle* toadd);
 
-void addNodeParticle(IGameDef* gamedef, scene::ISceneManager* smgr,
-       LocalPlayer *player, ClientEnvironment &env, v3s16 pos,
-       const TileSpec tiles[]);
+private:
+
+       void stepParticles (float dtime);
+       void stepSpawners (float dtime);
+
+       void clearAll ();
+
+       std::vector<Particle*> m_particles;
+       std::map<u32, ParticleSpawner*> m_particle_spawners;
+
+       ClientEnvironment* m_env;
+       JMutex m_particle_list_lock;
+       JMutex m_spawner_list_lock;
+};
 
 #endif