diff options
author | Stijn Buys <ingar@osirion.org> | 2012-11-25 21:30:16 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2012-11-25 21:30:16 +0000 |
commit | 52b393e9692c3a93acdb207c53dbbf5e9df13e75 (patch) | |
tree | 51388c412495c47e355608f8a462d74e5a07ce7d | |
parent | 71503d65f1099d9f34010de98d377f8f2f5e474e (diff) |
Draw particles on projectile models.
-rw-r--r-- | src/render/particles.cc | 2 | ||||
-rw-r--r-- | src/render/renderext.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/render/particles.cc b/src/render/particles.cc index 4624539..6681a4f 100644 --- a/src/render/particles.cc +++ b/src/render/particles.cc @@ -384,6 +384,8 @@ void ParticleSystem::draw(const float elapsed) if ((controlable->thrust() > 0.0f) || (controlable->state() == core::Entity::ImpulseInitiate) || (controlable->state() == core::Entity::Impulse)) { ejector_active = true; } + } else if (particlesystem_entity->type() == core::Entity::Projectile) { + ejector_active = true; } } diff --git a/src/render/renderext.cc b/src/render/renderext.cc index f8fd453..0f781c5 100644 --- a/src/render/renderext.cc +++ b/src/render/renderext.cc @@ -126,7 +126,7 @@ void RenderExt::frame(float elapsed) int state = core::Entity::Normal; - if (entity()->type() == core::Entity::Dynamic) { + if ((entity()->type() == core::Entity::Dynamic) || (entity()->type() == core::Entity::Projectile)) { state = static_cast<core::EntityDynamic *>(entity())->state(); |