Merge pull request #7254 from dabingnn/v3_fix

fix outline bug
This commit is contained in:
minggo 2014-06-30 17:26:11 +08:00
commit 100968e4e5
1 changed files with 3 additions and 5 deletions

View File

@ -24,12 +24,10 @@ void main()
accum += texture2D(CC_Texture0, vec2(v_texCoord.x - radius, v_texCoord.y + radius));
accum *= u_threshold;
accum.rgb = u_outlineColor * accum.a;
accum.a = 1.0;
accum.r = u_outlineColor.x;
accum.g = u_outlineColor.y;
accum.b = u_outlineColor.z;
normal = (accum * (1.0 - normal.a)) + (normal * normal.a);
normal = ( accum * (1.0 - normal.a)) + (normal * normal.a);
gl_FragColor = v_fragmentColor * normal;
}