oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Remove texture atlas / AtlasPointer, rename getTextureRaw to getTexture

Browse source
This commit is contained in:
Kahrl 2013-06-24 04:17:50 +02:00
parent caf0b67e47
commit 8161ab573f
18 changed files with 260 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/particles.h
View file

@ -42,7 +42,9 @@ class Particle : public scene::ISceneNode
float expirationtime,
float size,
bool collisiondetection,
AtlasPointer texture
video::ITexture *texture,
v2f texpos,
v2f texsize
);
~Particle();
@ -81,16 +83,13 @@ private:
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;
};
@ -109,7 +108,7 @@ class ParticleSpawner
float minexptime, float maxexptime,
float minsize, float maxsize,
bool collisiondetection,
AtlasPointer ap,
video::ITexture *texture,
u32 id);
~ParticleSpawner();
@ -136,7 +135,7 @@ class ParticleSpawner
float m_maxexptime;
float m_minsize;
float m_maxsize;
AtlasPointer m_ap;
video::ITexture *m_texture;
std::vector<float> m_spawntimes;
bool m_collisiondetection;
};