From 24b712a956a48f43788e1c11e121aedf52e22278 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 26 Nov 2018 08:37:17 +0800 Subject: =?UTF-8?q?*=E7=B2=92=E5=AD=90=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/graphics/particles/je_particle_system.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/libjin/graphics/particles/je_particle_system.cpp') diff --git a/src/libjin/graphics/particles/je_particle_system.cpp b/src/libjin/graphics/particles/je_particle_system.cpp index 2c2f9bb..a6e9460 100644 --- a/src/libjin/graphics/particles/je_particle_system.cpp +++ b/src/libjin/graphics/particles/je_particle_system.cpp @@ -1,5 +1,7 @@ #include +#include "../../utils/je_log.h" + #include "je_particle_system.h" namespace JinEngine @@ -60,6 +62,7 @@ namespace JinEngine { Particle* p = new (mParticlePool.GetNextWithoutInitializing()) Particle(); mAliveParticles.push_back(p); + jin_log_info("particle count %d", mAliveParticles.size()); return p; } @@ -216,16 +219,16 @@ namespace JinEngine mDef.particleDef.scaleDef.overTime.value.removePoint(i); } - void ParticleSystem::setParticleColor(Color color) + void ParticleSystem::setParticleColor(Color tint) { mDef.particleDef.colorDef.overTime.enable = false; - mDef.particleDef.colorDef.color = color; + mDef.particleDef.colorDef.color = tint; } - void ParticleSystem::addParticleColorPoint(Color color, float t) + void ParticleSystem::addParticleColorPoint(Color tint, float t) { mDef.particleDef.colorDef.overTime.enable = true; - mDef.particleDef.colorDef.overTime.value.addColor(color, t); + mDef.particleDef.colorDef.overTime.value.addColor(tint, t); } void ParticleSystem::removeParticleColorPoint(uint i) -- cgit v1.1-26-g67d0