Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12247 from stari4ek/v3-outline-inner-holes 

improve rendering of letter's inner shapes when outline is used
This commit is contained in:
子龙山人 2015-06-09 23:11:39 +08:00
parent b40113d6c5 dae8f788c1
commit a202387800
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/renderer/ccShader_Label_outline.frag
View File

@ -17,7 +17,7 @@ void main()
vec4 sample = texture2D(CC_Texture0, v_texCoord); vec4 sample = texture2D(CC_Texture0, v_texCoord);
float fontAlpha = sample.a; float fontAlpha = sample.a;
float outlineAlpha = sample.r; float outlineAlpha = sample.r;
if (outlineAlpha > 0.0){ if ((fontAlpha + outlineAlpha) > 0.0){
vec4 color = u_textColor * fontAlpha + u_effectColor * (1.0 - fontAlpha); vec4 color = u_textColor * fontAlpha + u_effectColor * (1.0 - fontAlpha);
gl_FragColor = v_fragmentColor * vec4( color.rgb,max(fontAlpha,outlineAlpha)*color.a); gl_FragColor = v_fragmentColor * vec4( color.rgb,max(fontAlpha,outlineAlpha)*color.a);
} }