ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GPUParticles: Force alpha additive for flip particles

Browse Source
This commit is contained in:
Vincent Lejeune
2014-01-26 23:34:21 +01:00
parent a6c9f11374
commit bf22a1122b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics/gpuparticles.cpp
View File

@@ -532,10 +532,8 @@ void ParticleSystemProxy::drawFlip()
glDisable(GL_CULL_FACE);
glEnable(GL_BLEND);
if (m_alpha_additive)
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
else
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendEquation(GL_FUNC_ADD);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
glUseProgram(ParticleShader::FlipParticleRender::Program);
float screen[2] = {
@@ -543,7 +541,7 @@ void ParticleSystemProxy::drawFlip()
(float)UserConfigParams::m_height
};
setTexture(0, texture, GL_LINEAR, GL_LINEAR);
setTexture(0, texture, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR);
setTexture(1, normal_and_depth, GL_NEAREST, GL_NEAREST);
ParticleShader::FlipParticleRender::setUniforms(irr_driver->getViewMatrix(), irr_driver->getProjMatrix(), irr_driver->getInvProjMatrix(), screen[0], screen[1], 0, 1);
@@ -575,7 +573,7 @@ void ParticleSystemProxy::drawNotFlip()
(float)UserConfigParams::m_height
};
setTexture(0, texture, GL_LINEAR, GL_LINEAR);
setTexture(0, texture, GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR);
setTexture(1, normal_and_depth, GL_NEAREST, GL_NEAREST);
ParticleShader::SimpleParticleRender::setUniforms(irr_driver->getViewMatrix(), irr_driver->getProjMatrix(), irr_driver->getInvProjMatrix(), screen[0], screen[1], 0, 1);