|
|
|
@ -40,6 +40,7 @@ ParticleEmitter::ParticleEmitter(const ParticleSystemPtr& parent)
|
|
|
|
|
m_currentBurst = 0;
|
|
|
|
|
m_elapsedTime = 0;
|
|
|
|
|
m_finished = false;
|
|
|
|
|
m_active = false;
|
|
|
|
|
|
|
|
|
|
// particles default configuration. (make them reasonable for user detect missing properties on scripts)
|
|
|
|
|
m_pMinPositionRadius = 0;
|
|
|
|
@ -59,7 +60,6 @@ ParticleEmitter::ParticleEmitter(const ParticleSystemPtr& parent)
|
|
|
|
|
m_pMaxAcceleration = 64;
|
|
|
|
|
m_pMinAccelerationAngle = 0;
|
|
|
|
|
m_pMaxAccelerationAngle = 360;
|
|
|
|
|
m_pColor = Color(255, 255, 255, 128);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool ParticleEmitter::load(const OTMLNodePtr& node)
|
|
|
|
@ -152,27 +152,39 @@ bool ParticleEmitter::load(const OTMLNodePtr& node)
|
|
|
|
|
m_pMinSize = childNode->value<Size>();
|
|
|
|
|
else if(childNode->tag() == "particle-max-size")
|
|
|
|
|
m_pMaxSize = childNode->value<Size>();
|
|
|
|
|
else if(childNode->tag() == "particle-color")
|
|
|
|
|
m_pColor = childNode->value<Color>();
|
|
|
|
|
|
|
|
|
|
else if(childNode->tag() == "particle-colors")
|
|
|
|
|
m_pColors = Fw::split<Color>(childNode->value());
|
|
|
|
|
else if(childNode->tag() == "particle-colors-stops")
|
|
|
|
|
m_pColorsStops = Fw::split<float>(childNode->value());
|
|
|
|
|
else if(childNode->tag() == "particle-texture")
|
|
|
|
|
m_pTexture = g_textures.getTexture(childNode->value());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(m_pColors.empty())
|
|
|
|
|
m_pColors.push_back(Color(255, 255, 255, 128));
|
|
|
|
|
m_pColorsStops.insert(m_pColorsStops.begin(), 0);
|
|
|
|
|
|
|
|
|
|
if(m_pColors.size() != m_pColorsStops.size()) {
|
|
|
|
|
logError("particle colors must be equal to colorstops-1");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ParticleEmitter::update(double elapsedTime)
|
|
|
|
|
{
|
|
|
|
|
// check if finished
|
|
|
|
|
if(m_duration > 0 && m_elapsedTime >= m_duration + m_delay) {
|
|
|
|
|
if(m_duration >= 0 && m_elapsedTime >= m_duration + m_delay) {
|
|
|
|
|
m_finished = true;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
m_elapsedTime += elapsedTime;
|
|
|
|
|
|
|
|
|
|
if(m_elapsedTime - elapsedTime < m_delay)
|
|
|
|
|
return;
|
|
|
|
|
if(!m_active && m_elapsedTime > m_delay)
|
|
|
|
|
m_active = true;
|
|
|
|
|
|
|
|
|
|
if(m_active) {
|
|
|
|
|
int currentBurst = std::floor((m_elapsedTime - m_delay) / m_burstRate) + 1;
|
|
|
|
|
for(int b = m_currentBurst; b < currentBurst; ++b) {
|
|
|
|
|
|
|
|
|
@ -198,9 +210,12 @@ void ParticleEmitter::update(double elapsedTime)
|
|
|
|
|
PointF pAcceleration(pAccelerationAbs * cos(pAccelerationAngle), pAccelerationAbs * sin(pAccelerationAngle));
|
|
|
|
|
|
|
|
|
|
ParticleSystemPtr particleSystem = m_parent.lock();
|
|
|
|
|
particleSystem->addParticle(ParticlePtr(new Particle(pPosition, pSize, pVelocity, pAcceleration, pDuration, m_pIgnorePhysicsAfter, m_pColor, m_pTexture)));
|
|
|
|
|
particleSystem->addParticle(ParticlePtr(new Particle(pPosition, pSize, pVelocity, pAcceleration, pDuration, m_pIgnorePhysicsAfter, m_pColors, m_pColorsStops, m_pTexture)));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
m_currentBurst = currentBurst;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
m_elapsedTime += elapsedTime;
|
|
|
|
|
}
|
|
|
|
|