summaryrefslogtreecommitdiff
path: root/src/particles.h
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2016-11-14 15:28:06 +0100
committersfan5 <sfan5@live.de>2016-11-14 15:28:06 +0100
commit5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b (patch)
tree5008360c4d239d5dfff8eee78b5ea79f69e176dc /src/particles.h
parent93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef (diff)
downloadminetest-5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b.tar.gz
minetest-5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b.tar.bz2
minetest-5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b.zip
Revert "Adding particle blend, glow and animation (#4705)"
This reverts commit 93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef.
Diffstat (limited to 'src/particles.h')
-rw-r--r--src/particles.h32
1 files changed, 2 insertions, 30 deletions
diff --git a/src/particles.h b/src/particles.h
index 6d8c6139f..eb8c6665d 100644
--- a/src/particles.h
+++ b/src/particles.h
@@ -50,14 +50,7 @@ class Particle : public scene::ISceneNode
bool vertical,
video::ITexture *texture,
v2f texpos,
- v2f texsize,
- u32 material_type_param,
- u16 vertical_frame_num,
- u16 horizontal_frame_num,
- u16 first_frame,
- float frame_length,
- bool loop_animation,
- u8 glow
+ v2f texsize
);
~Particle();
@@ -109,12 +102,6 @@ private:
bool m_collision_removal;
bool m_vertical;
v3s16 m_camera_offset;
- u16 m_vertical_frame_num;
- u16 m_horizontal_frame_num;
- u16 m_first_frame;
- float m_frame_length;
- bool m_loop_animation;
- u8 m_glow;
};
class ParticleSpawner
@@ -136,15 +123,8 @@ class ParticleSpawner
bool vertical,
video::ITexture *texture,
u32 id,
- u32 material_type_param,
- u16 vertical_frame_num,
- u16 horizontal_frame_num,
- u16 min_first_frame,
- u16 max_first_frame,
- float frame_length,
- bool loop_animation,
- u8 glow,
ParticleManager* p_manager);
+
~ParticleSpawner();
void step(float dtime, ClientEnvironment *env);
@@ -176,14 +156,6 @@ class ParticleSpawner
bool m_collision_removal;
bool m_vertical;
u16 m_attached_id;
- u32 m_material_type_param;
- u16 m_vertical_frame_num;
- u16 m_horizontal_frame_num;
- u16 m_min_first_frame;
- u16 m_max_first_frame;
- float m_frame_length;
- bool m_loop_animation;
- u8 m_glow;
};
/**