diff options
| author | nerzhul <loic.blot@unix-experience.fr> | 2016-02-11 15:21:21 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-02-11 16:55:15 +0100 |
| commit | fefa148d694364cb4c60fbb4ffdc0f8ae6388df6 (patch) | |
| tree | 8755fd0d4ef196c23924ae2909a29681f9f77f05 /src/particles.h | |
| parent | 24b312cc085b7fae6477c8a47fffb57484b20f6e (diff) | |
| download | minetest-fefa148d694364cb4c60fbb4ffdc0f8ae6388df6.tar.gz minetest-fefa148d694364cb4c60fbb4ffdc0f8ae6388df6.tar.bz2 minetest-fefa148d694364cb4c60fbb4ffdc0f8ae6388df6.zip | |
v2d & aabbox3d<f32> & sky cleanups
* Sky: rename Box => m_box and inline getBoundingBox
* Uniformize aabbox3d<f32> to aabb3f
Diffstat (limited to 'src/particles.h')
| -rw-r--r-- | src/particles.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/particles.h b/src/particles.h index 0ad8d71b5..dda84385c 100644 --- a/src/particles.h +++ b/src/particles.h @@ -52,7 +52,7 @@ class Particle : public scene::ISceneNode ); ~Particle(); - virtual const core::aabbox3d<f32>& getBoundingBox() const + virtual const aabb3f &getBoundingBox() const { return m_box; } @@ -85,8 +85,8 @@ private: ClientEnvironment *m_env; IGameDef *m_gamedef; - core::aabbox3d<f32> m_box; - core::aabbox3d<f32> m_collisionbox; + aabb3f m_box; + aabb3f m_collisionbox; video::SMaterial m_material; v2f m_texpos; v2f m_texsize; |