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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/particles.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/particles.cpp b/src/particles.cpp index 8150e19ac..ab77e9f54 100644 --- a/src/particles.cpp +++ b/src/particles.cpp @@ -88,7 +88,7 @@ Particle::Particle( m_vertical = vertical; // Irrlicht stuff - m_collisionbox = core::aabbox3d<f32> + m_collisionbox = aabb3f (-size/2,-size/2,-size/2,size/2,size/2,size/2); this->setAutomaticCulling(scene::EAC_OFF); @@ -128,7 +128,7 @@ void Particle::step(float dtime) m_time += dtime; if (m_collisiondetection) { - core::aabbox3d<f32> box = m_collisionbox; + aabb3f box = m_collisionbox; v3f p_pos = m_pos*BS; v3f p_velocity = m_velocity*BS; collisionMoveSimple(m_env, m_gamedef, |