TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

ShaderGenerator: fix M_blend to match fixed-function pipeline

Browse Source 
See panda3d/panda3d#178
This commit is contained in:
rdb 2017-11-01 20:19:40 +01:00
parent 73d13a8f5c
commit 745b51f10f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/pgraphnodes/shaderGenerator.cxx
View File

@ -1417,7 +1417,10 @@ synthesize_shader(const RenderState *rs, const GeomVertexAnimationSpec &anim) {
text << "\t result.rgb = lerp(result, tex" << i << ", tex" << i << ".a).rgb;\n";
break;
case TextureStage::M_blend:
text << "\t result.rgb = lerp(result, tex" << i << " * texcolor_" << i << ", tex" << i << ".r).rgb;\n";
text << "\t result.rgb = lerp(result.rgb, texcolor_" << i << ".rgb, tex" << i << ".rgb);\n";
if (key._calc_primary_alpha) {
text << "\t result.a *= tex" << i << ".a;\n";
}
break;
case TextureStage::M_replace:
text << "\t result = tex" << i << ";\n";