Fix memory leaks due to messed up memory handling for particles as well as their...

[minetest.git] / src / particles.h

diff --git a/src/particles.h b/src/particles.h
index 3ed9dfdc8bdad44817aa21ecd7d722ff7a196ca6..d7f1147f16cf07b5a145f83ddee0ef7918d431b3 100644 (file)
--- a/src/particles.h
+++ b/src/particles.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -28,6 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "localplayer.h"
 #include "environment.h"
 
+struct ClientEvent;
+class ParticleManager;
+
 class Particle : public scene::ISceneNode
 {
        public:
@@ -35,13 +38,17 @@ class Particle : public scene::ISceneNode
                IGameDef* gamedef,
                scene::ISceneManager* mgr,
                LocalPlayer *player,
-               s32 id,
+               ClientEnvironment *env,
                v3f pos,
                v3f velocity,
                v3f acceleration,
                float expirationtime,
                float size,
-               AtlasPointer texture
+               bool collisiondetection,
+               bool vertical,
+               video::ITexture *texture,
+               v2f texpos,
+               v2f texsize
        );
        ~Particle();
 
@@ -63,36 +70,128 @@ class Particle : public scene::ISceneNode
        virtual void OnRegisterSceneNode();
        virtual void render();
 
-       void step(float dtime, ClientEnvironment &env);
+       void step(float dtime);
 
        bool get_expired ()
        { return m_expiration < m_time; }
 
 private:
+       void updateLight();
+       void updateVertices();
+
+       video::S3DVertex m_vertices[4];
        float m_time;
        float m_expiration;
 
+       ClientEnvironment *m_env;
        IGameDef *m_gamedef;
        core::aabbox3d<f32> m_box;
        core::aabbox3d<f32> m_collisionbox;
        video::SMaterial m_material;
+       v2f m_texpos;
+       v2f m_texsize;
        v3f m_pos;
        v3f m_velocity;
        v3f m_acceleration;
-       float tex_x0;
-       float tex_x1;
-       float tex_y0;
-       float tex_y1;
        LocalPlayer *m_player;
        float m_size;
-       AtlasPointer m_ap;
        u8 m_light;
+       bool m_collisiondetection;
+       bool m_vertical;
+       v3s16 m_camera_offset;
 };
 
-void allparticles_step (float dtime, ClientEnvironment &env);
+class ParticleSpawner
+{
+       public:
+       ParticleSpawner(IGameDef* gamedef,
+               scene::ISceneManager *smgr,
+               LocalPlayer *player,
+               u16 amount,
+               float time,
+               v3f minp, v3f maxp,
+               v3f minvel, v3f maxvel,
+               v3f minacc, v3f maxacc,
+               float minexptime, float maxexptime,
+               float minsize, float maxsize,
+               bool collisiondetection,
+               bool vertical,
+               video::ITexture *texture,
+               u32 id,
+               ParticleManager* p_manager);
+
+       ~ParticleSpawner();
+
+       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;
+       LocalPlayer *m_player;
+       u16 m_amount;
+       float m_spawntime;
+       v3f m_minpos;
+       v3f m_maxpos;
+       v3f m_minvel;
+       v3f m_maxvel;
+       v3f m_minacc;
+       v3f m_maxacc;
+       float m_minexptime;
+       float m_maxexptime;
+       float m_minsize;
+       float m_maxsize;
+       video::ITexture *m_texture;
+       std::vector<float> m_spawntimes;
+       bool m_collisiondetection;
+       bool m_vertical;
 
-void addDiggingParticles(IGameDef* gamedef, scene::ISceneManager* smgr, LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
-void addPunchingParticles(IGameDef* gamedef, scene::ISceneManager* smgr, LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
-void addNodeParticle(IGameDef* gamedef, scene::ISceneManager* smgr, LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+};
+
+/**
+ * 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 addPunchingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
+               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+
+       void addNodeParticle(IGameDef* gamedef, scene::ISceneManager* smgr,
+               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+
+protected:
+       void addParticle(Particle* toadd);
+
+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