diff --git a/src/ei/engine/effects/Particles.java b/src/ei/engine/effects/Particles.java index e91e050..5c9ad72 100644 --- a/src/ei/engine/effects/Particles.java +++ b/src/ei/engine/effects/Particles.java @@ -186,20 +186,21 @@ public class Particles extends Entity{ // Fading to another color if(particle[i].r < colors[particle[i].colorId][1][0]) - particle[i].r += 0.2f; - if(particle[i].g < colors[particle[i].colorId][1][1]) - particle[i].g += 0.2f; - if(particle[i].b < colors[particle[i].colorId][1][2]) - particle[i].b += 0.2f; - + particle[i].r += (particle[i].fade/life); if(particle[i].r > colors[particle[i].colorId][1][0]) - particle[i].r -= 0.2f; - if(particle[i].g > colors[particle[i].colorId][1][1]) - particle[i].g -= 0.2f; - if(particle[i].b > colors[particle[i].colorId][1][2]) - particle[i].b -= 0.2f; + particle[i].r -= (particle[i].fade/life); + + if(particle[i].g < colors[particle[i].colorId][1][1]) + particle[i].g += (particle[i].fade/life); + if(particle[i].g > colors[particle[i].colorId][1][1]) + particle[i].g -= (particle[i].fade/life); + + if(particle[i].b < colors[particle[i].colorId][1][2]) + particle[i].b += (particle[i].fade/life); + if(particle[i].b > colors[particle[i].colorId][1][2]) + particle[i].b -= (particle[i].fade/life); + - if (particle[i].life < 0.0f) { // If Particle Is Burned Out particle[i].active = true; // Make All The Particles Active particle[i].life = life; // Give It New Life