From fefa148d694364cb4c60fbb4ffdc0f8ae6388df6 Mon Sep 17 00:00:00 2001 From: nerzhul Date: Thu, 11 Feb 2016 15:21:21 +0100 Subject: v2d & aabbox3d & sky cleanups * Sky: rename Box => m_box and inline getBoundingBox * Uniformize aabbox3d to aabb3f --- src/particles.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/particles.cpp') 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 + 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 box = m_collisionbox; + aabb3f box = m_collisionbox; v3f p_pos = m_pos*BS; v3f p_velocity = m_velocity*BS; collisionMoveSimple(m_env, m_gamedef, -- cgit v1.2.3