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

Merge pull request #11696 from WenhaiLin/v3-label-shadow-glerror 

Label:Fixed shadow effect cause OpenGL error on IOS.
This commit is contained in:
minggo 2015-05-06 09:53:39 +08:00
parent 1d78beb9ea 8f6277c540
commit 6351863b3c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/2d/CCLabel.cpp
View File

@ -912,8 +912,11 @@ void Label::onDraw(const Mat4& transform, bool transformUpdated)
{ {
glprogram->setUniformLocationWith4f(_uniformTextColor, glprogram->setUniformLocationWith4f(_uniformTextColor,
_shadowColor4F.r, _shadowColor4F.g, _shadowColor4F.b, _shadowColor4F.a); _shadowColor4F.r, _shadowColor4F.g, _shadowColor4F.b, _shadowColor4F.a);
if (_currLabelEffect == LabelEffect::OUTLINE || _currLabelEffect == LabelEffect::GLOW)
{
glprogram->setUniformLocationWith4f(_uniformEffectColor, glprogram->setUniformLocationWith4f(_uniformEffectColor,
_shadowColor4F.r, _shadowColor4F.g, _shadowColor4F.b, _shadowColor4F.a); _shadowColor4F.r, _shadowColor4F.g, _shadowColor4F.b, _shadowColor4F.a);
}
getGLProgram()->setUniformsForBuiltins(_shadowTransform); getGLProgram()->setUniformsForBuiltins(_shadowTransform);
for (const auto &child : _children) for (const auto &child : _children)