mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-04 13:27:14 +00:00
Code Issues Releases Wiki Activity

Add option for particles to inherit alpha/color from their ParticleEffect

Browse source
This commit is contained in:
fgenesis 2014-03-10 17:28:41 +01:00
commit 65e457423c
5 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BBGE/Emitter.cpp
View file

@ -284,6 +284,8 @@ void Emitter::onRender()
if (hasRot)
{
Vector colorMult = data.inheritColor ? pe->color : Vector(1, 1, 1);
float alphaMult = data.inheritAlpha ? pe->alpha.x : 1;
for (Particles::iterator i = particles.begin(); i != particles.end(); i++)
{
Particle *p = *i;
@ -293,7 +295,8 @@ void Emitter::onRender()
const float dy = h2 * p->scale.y;
#ifdef BBGE_BUILD_OPENGL
glColor4f(p->color.x, p->color.y, p->color.z, p->alpha.x);
Vector col = p->color * colorMult;
glColor4f(col.x, col.y, col.z, p->alpha.x * alphaMult);
if (p->rot.z != 0 || p->rot.isInterpolating())