BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added scale and color interpolation

Browse Source
This commit is contained in:
Stiffly
2014-04-22 17:59:55 +02:00
parent 55221cca12
commit 78d4dbf8c2
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/ParticleSystem.cpp
+29 -3
View File
@@ -27,9 +27,10 @@ void Systems::ParticleSystem::UpdateEntity(double dt, EntityID entity, EntityID
std::list<ParticleData>::iterator it;
for(it = m_ParticleEmitter[entity].begin(); it == m_ParticleEmitter[entity].end();)
{
it->TimeLived += dt;
auto particleComponent = m_World->GetComponent<Components::Particle>(it->ParticleID, "Particle");
if(it->TimeLived > particleComponent->LifeTime)
int timeLived = glfwGetTime() - it->SpawnTime;
if(timeLived > particleComponent->LifeTime)
{
m_ParticleEmitter[entity].erase(it);
break;
@@ -39,7 +40,20 @@ void Systems::ParticleSystem::UpdateEntity(double dt, EntityID entity, EntityID
it++;
}
// Interpolates the color for each color channel by the start and end value. Decides how much the color should be interpolated based on time.
// How big fraction the color is multiplied with
float timeProgress = timeLived / particleComponent->LifeTime;
// The difference between the start and end value
float deltaColor = glm::abs(particleComponent->ColorSpectrum[0].r - particleComponent->ColorSpectrum[1].r);
it->color.r = particleComponent->ColorSpectrum[0].r + deltaColor * timeProgress;
deltaColor = glm::abs(particleComponent->ColorSpectrum[0].g - particleComponent->ColorSpectrum[1].g);
it->color.g = particleComponent->ColorSpectrum[0].g + deltaColor * timeProgress;
deltaColor = glm::abs(particleComponent->ColorSpectrum[0].b - particleComponent->ColorSpectrum[1].b);
it->color.b = particleComponent->ColorSpectrum[0].b + deltaColor * timeProgress;
//Interpolates the scale for the particle
float deltaScale = glm::abs(particleComponent->ScaleSpectrum[0] - particleComponent->ScaleSpectrum[1]);
it->Scale = particleComponent->ScaleSpectrum[0] + deltaScale * timeProgress;
}
}
}
@@ -56,13 +70,25 @@ void Systems::ParticleSystem::SpawnParticles(EntityID emitterID, float spawnCoun
for(int i = 0; i < spawnCount; i++)
{
auto ent = m_World->CreateEntity();
auto transform = m_World->AddComponent<Components::Transform>(ent, "Transform");
transform->Position = glm::vec3(0);
auto particle = m_World->AddComponent<Components::Particle>(ent, "Particle");
particle->LifeTime = 4;
Color startColor = {.4f, .45f, .2f};
particle->ColorSpectrum.push_back(startColor);
Color endColor = {0.f, 45.f, 23.f};
particle->ColorSpectrum.push_back(endColor);
particle->ScaleSpectrum.push_back(1);
particle->ScaleSpectrum.push_back(30);
ParticleData data;
data.ParticleID = ent;
data.TimeLived = 0;
data.SpawnTime = glfwGetTime();
data.color = particle->ColorSpectrum[0];
data.Scale = particle->ScaleSpectrum[0];
m_ParticleEmitter[emitterID].push_back(data);
}
}