From e6516fb9999ae47a828e032f0908d2f2ae4b2434 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Fri, 12 Nov 2010 19:50:04 +0000 Subject: enables entity model scaling, Entity::radius() gets precedence over Model::radius(), corrected bullet motionstate transfer bug in Entity::reset(), minor cleanups --- src/render/particles.cc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/render/particles.cc') diff --git a/src/render/particles.cc b/src/render/particles.cc index 6ffcd35..610c49a 100644 --- a/src/render/particles.cc +++ b/src/render/particles.cc @@ -211,6 +211,14 @@ ParticleSystem::ParticleSystem(ParticleScript *script, core::Entity *entity, mod particlesystem_axis.assign(modelclass->axis()); // particlesystem_cull = particlesystem_modelclass->cull(); } + + + // rescale particle system according to entity radius + if (entity->model() && entity->model()->radius()) { + const float modelscale = entity->radius() / entity->model()->radius(); + particlesystem_location *= modelscale; + particlesystem_radius *= modelscale; + } } ParticleSystem::~ParticleSystem() -- cgit v1.2.3