Remove texture atlas / AtlasPointer, rename getTextureRaw to getTexture

1 files changed, 7 insertions, 8 deletions

diff --git a/src/particles.h b/src/particles.h
index 308da551f..327dcbc9e 100644
--- a/src/particles.h
+++ b/src/particles.h
@@ -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;
 };