From 1d5bf20b80344aa88e3af5aaa9fb359d1dddba7b Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 24 Jul 2013 17:03:35 -0700 Subject: [PATCH] clean up --- interface/src/ParticleSystem.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/interface/src/ParticleSystem.cpp b/interface/src/ParticleSystem.cpp index 707fce967a..350f2a6b65 100644 --- a/interface/src/ParticleSystem.cpp +++ b/interface/src/ParticleSystem.cpp @@ -24,18 +24,20 @@ ParticleSystem::ParticleSystem() { _upDirection = glm::vec3(0.0f, 1.0f, 0.0f); // default for (unsigned int emitterIndex = 0; emitterIndex < MAX_EMITTERS; emitterIndex++) { - - _emitter[emitterIndex].position = glm::vec3(0.0f, 0.0f, 0.0f); - _emitter[emitterIndex].direction = glm::vec3(0.0f, 1.0f, 0.0f); - _emitter[emitterIndex].visible = false; - _emitter[emitterIndex].particleResolution = DEFAULT_PARTICLE_SPHERE_RESOLUTION; - _emitter[emitterIndex].particleLifespan = DEFAULT_PARTICLE_LIFESPAN; - _emitter[emitterIndex].showingBaseParticle = false; - _emitter[emitterIndex].emitReserve = 0.0; - _emitter[emitterIndex].thrust = 0.0f; - _emitter[emitterIndex].rate = 0.0f; - _emitter[emitterIndex].currentParticle = 0; - _emitter[emitterIndex].particleRenderStyle = PARTICLE_RENDER_STYLE_SPHERE; + + Emitter e = _emitter[emitterIndex]; + + e.position = glm::vec3(0.0f, 0.0f, 0.0f); + e.direction = glm::vec3(0.0f, 1.0f, 0.0f); + e.visible = false; + e.particleResolution = DEFAULT_PARTICLE_SPHERE_RESOLUTION; + e.particleLifespan = DEFAULT_PARTICLE_LIFESPAN; + e.showingBaseParticle = false; + e.emitReserve = 0.0; + e.thrust = 0.0f; + e.rate = 0.0f; + e.currentParticle = 0; + e.particleRenderStyle = PARTICLE_RENDER_STYLE_SPHERE; for (int lifeStage = 0; lifeStage