From 405cb516f6de21217266064380d1b5a6cacd039a Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Mon, 5 Aug 2013 12:05:15 -0700 Subject: [PATCH] removed 3 magic numbers in particle system --- interface/src/ParticleSystem.cpp | 6 +++--- interface/src/ParticleSystem.h | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/interface/src/ParticleSystem.cpp b/interface/src/ParticleSystem.cpp index c3e24a3d9f..5aed606191 100644 --- a/interface/src/ParticleSystem.cpp +++ b/interface/src/ParticleSystem.cpp @@ -344,9 +344,9 @@ void ParticleSystem::updateParticle(int p, float deltaTime) { } else if (myEmitter.particleAttributes[lifeStage].modulationStyle == COLOR_MODULATION_STYLE_RAINBOW_CYCLE) { float amp = myEmitter.particleAttributes[lifeStage].modulationAmplitude * ONE_HALF; - redModulation = sinf(radian * 0.5f) * amp; - greenModulation = sinf(radian * 0.7f) * amp; - bueModulation = sinf(radian * 1.0f) * amp; + redModulation = sinf(radian * RAINBOW_CYCLE_RED_RATE ) * amp; + greenModulation = sinf(radian * RAINBOW_CYCLE_GREEN_RATE) * amp; + bueModulation = sinf(radian * RAINBOW_CYCLE_BLUE_RATE ) * amp; } _particle[p].color.r += redModulation; diff --git a/interface/src/ParticleSystem.h b/interface/src/ParticleSystem.h index 840c1e63cc..60bd0f91d4 100644 --- a/interface/src/ParticleSystem.h +++ b/interface/src/ParticleSystem.h @@ -15,6 +15,10 @@ const int NULL_PARTICLE = -1; const int MAX_EMITTERS = 100; const int MAX_PARTICLES = 5000; +const float RAINBOW_CYCLE_RED_RATE = 0.5f; +const float RAINBOW_CYCLE_GREEN_RATE = 0.7f; +const float RAINBOW_CYCLE_BLUE_RATE = 1.0f; + enum ParticleRenderStyle { PARTICLE_RENDER_STYLE_SPHERE = 0,