From 5eeb0c7eedc7780e039e610c095f6250a197cabc Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 24 Aug 2004 22:07:52 +0000 Subject: [PATCH] apply orientation to geom particles --- panda/src/particlesystem/geomParticleRenderer.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/particlesystem/geomParticleRenderer.cxx b/panda/src/particlesystem/geomParticleRenderer.cxx index f5f90ac8e6..e6e2b67751 100644 --- a/panda/src/particlesystem/geomParticleRenderer.cxx +++ b/panda/src/particlesystem/geomParticleRenderer.cxx @@ -160,7 +160,6 @@ kill_particle(int index) { void GeomParticleRenderer:: render(pvector< PT(PhysicsObject) >& po_vector, int ttl_particles) { BaseParticle *cur_particle; - LPoint3f pos; int i, remaining_particles = ttl_particles; pvector< PT(PandaNode) >::iterator cur_node_iter = _node_vector.begin(); @@ -181,8 +180,6 @@ render(pvector< PT(PhysicsObject) >& po_vector, int ttl_particles) { } nassertv(cur_node != (PandaNode *)NULL); - pos = cur_particle->get_position(); - cur_node->set_state(_render_state); if ((_alpha_mode != PR_ALPHA_NONE)) { @@ -201,7 +198,10 @@ render(pvector< PT(PhysicsObject) >& po_vector, int ttl_particles) { (Colorf(1.0f, 1.0f, 1.0f, alpha_scalar))); } - cur_node->set_transform(TransformState::make_pos(pos)); + cur_node->set_transform(TransformState::make_pos_quat_scale + (cur_particle->get_position(), + cur_particle->get_orientation(), + LVecBase3f(1.0f, 1.0f, 1.0f))); // maybe get out early if possible.