mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 22:21:18 +02:00
Code Issues Projects Releases Wiki Activity

- daylight effects for unit particles ( best use with mode "black" )

Browse Source 
- meadow has good looking mist in night now
- startdelay for particles
This commit is contained in:
Titus Tscharntke
2012-01-07 20:24:54 +00:00
parent 1f60d2606a
commit e05984d527
10 changed files with 78 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/shared_lib/sources/graphics/particle.cpp
View File

@@ -74,6 +74,7 @@ ParticleSystem::ParticleSystem(int particleCount) {
teamcolorNoEnergy= false;
teamcolorEnergy= false;
alternations= 0;
particleSystemStartDelay= 0;
}
ParticleSystem::~ParticleSystem(){
@@ -97,8 +98,10 @@ void ParticleSystem::update(){
if(aliveParticleCount > (int) particles.size()){
throw runtime_error("aliveParticleCount >= particles.size()");
}
if(state != sPause){
if(particleSystemStartDelay>0){
particleSystemStartDelay--;
}
else if(state != sPause){
for(int i= 0; i < aliveParticleCount; ++i){
updateParticle(&particles[i]);
@@ -527,6 +530,7 @@ void GameParticleSystem::setTween(float relative,float absolute) {
// UnitParticleSystem
// ===========================================================================
bool UnitParticleSystem::isNight= false;
Vec3f UnitParticleSystem::lightColor=Vec3f(1.0f,1.0f,1.0f);
UnitParticleSystem::UnitParticleSystem(int particleCount):
GameParticleSystem(particleCount),
@@ -549,6 +553,7 @@ UnitParticleSystem::UnitParticleSystem(int particleCount):
isVisibleAtNight= true;
isVisibleAtDay= true;
isDaylightAffected= false;
cRotation= Vec3f(1.0f, 1.0f, 1.0f);
fixedAddition= Vec3f(0.0f, 0.0f, 0.0f);
@@ -736,6 +741,12 @@ void UnitParticleSystem::updateParticle(Particle *p){
}
p->speed+= p->accel;
p->color= color * energyRatio + colorNoEnergy * (1.0f - energyRatio);
if(isDaylightAffected)
{
p->color.x=p->color.x*lightColor.x;
p->color.y=p->color.y*lightColor.y;
p->color.z=p->color.z*lightColor.z;
}
p->size= particleSize * energyRatio + sizeNoEnergy * (1.0f - energyRatio);
if(state == ParticleSystem::sFade || staticParticleCount < 1){
p->energy--;