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

Better fix for missing transparency in GLES legacy pipeline

Browse Source
This commit is contained in:
Deve 2017-03-08 23:17:03 +01:00
parent 21cb853079
commit adfa8f30f9
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/shaders/irrlicht/COGLES2FixedPipeline.fsh
View File

@ -37,7 +37,7 @@ vec4 renderSolid()
if(uTextureUsage0) if(uTextureUsage0)
Color *= texture2D(uTextureUnit0, varTexCoord0); Color *= texture2D(uTextureUnit0, varTexCoord0);
Color.a = 1.0; //Color.a = 1.0;
return Color; return Color;
} }

13
lib/irrlicht/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp
View File

@ -67,15 +67,12 @@ void COGLES2FixedPipelineRenderer::OnSetMaterial(const video::SMaterial& materia
} }
else if (Blending) else if (Blending)
{ {
//E_BLEND_FACTOR srcFact,dstFact; E_BLEND_FACTOR srcFact,dstFact;
//E_MODULATE_FUNC modulate; E_MODULATE_FUNC modulate;
//u32 alphaSource; u32 alphaSource;
//unpack_textureBlendFunc(srcFact, dstFact, modulate, alphaSource, material.MaterialTypeParam); unpack_textureBlendFunc(srcFact, dstFact, modulate, alphaSource, material.MaterialTypeParam);
//Driver->getBridgeCalls()->setBlendFunc(Driver->getGLBlend(srcFact), Driver->getGLBlend(dstFact)); Driver->getBridgeCalls()->setBlendFunc(Driver->getGLBlend(srcFact), Driver->getGLBlend(dstFact));
//Driver->getBridgeCalls()->setBlend(true);
Driver->getBridgeCalls()->setBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
Driver->getBridgeCalls()->setBlend(true); Driver->getBridgeCalls()->setBlend(true);
} }
else else