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

Merge pull request #11478 from WenhaiLin/v3-label-fix 

Label:Fixed the shadow effect of system font might not be shown.
This commit is contained in:
minggo 2015-04-17 17:53:52 +08:00
parent 768d2bdb48 9c2e39dd49
commit f38bfdf212
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cocos/2d/CCLabel.cpp
View File

@ -788,7 +788,14 @@ void Label::enableShadow(const Color4B& shadowColor /* = Color4B::BLACK */,const
//TODO: support blur for shadow //TODO: support blur for shadow
_shadowBlurRadius = 0; _shadowBlurRadius = 0;
if (_textSprite && _shadowNode) _shadowColor3B.r = shadowColor.r;
_shadowColor3B.g = shadowColor.g;
_shadowColor3B.b = shadowColor.b;
_shadowOpacity = shadowColor.a;
if (!_systemFontDirty && !_contentDirty && _textSprite)
{
if (_shadowNode)
{ {
if (shadowColor != _shadowColor4F) if (shadowColor != _shadowColor4F)
{ {
@ -801,11 +808,11 @@ void Label::enableShadow(const Color4B& shadowColor /* = Color4B::BLACK */,const
_shadowNode->setPosition(_shadowOffset.width, _shadowOffset.height); _shadowNode->setPosition(_shadowOffset.width, _shadowOffset.height);
} }
} }
else
_shadowColor3B.r = shadowColor.r; {
_shadowColor3B.g = shadowColor.g; createShadowSpriteForSystemFont();
_shadowColor3B.b = shadowColor.b; }
_shadowOpacity = shadowColor.a; }
_shadowColor4F.r = shadowColor.r / 255.0f; _shadowColor4F.r = shadowColor.r / 255.0f;
_shadowColor4F.g = shadowColor.g / 255.0f; _shadowColor4F.g = shadowColor.g / 255.0f;
@ -1038,18 +1045,18 @@ void Label::createSpriteForSystemFont()
void Label::createShadowSpriteForSystemFont() void Label::createShadowSpriteForSystemFont()
{ {
if (!_fontDefinition._stroke._strokeEnabled && _fontDefinition._fontFillColor == _shadowColor4F if (!_fontDefinition._stroke._strokeEnabled && _fontDefinition._fontFillColor == _shadowColor3B
&& (_fontDefinition._fontAlpha == _shadowColor4F.a * 255)) && (_fontDefinition._fontAlpha == _shadowOpacity))
{ {
_shadowNode = Sprite::createWithTexture(_textSprite->getTexture()); _shadowNode = Sprite::createWithTexture(_textSprite->getTexture());
} }
else else
{ {
auto shadowFontDefinition = _fontDefinition; auto shadowFontDefinition = _fontDefinition;
shadowFontDefinition._fontFillColor.r = _shadowColor4F.r * 255; shadowFontDefinition._fontFillColor.r = _shadowColor3B.r;
shadowFontDefinition._fontFillColor.g = _shadowColor4F.g * 255; shadowFontDefinition._fontFillColor.g = _shadowColor3B.g;
shadowFontDefinition._fontFillColor.b = _shadowColor4F.b * 255; shadowFontDefinition._fontFillColor.b = _shadowColor3B.b;
shadowFontDefinition._fontAlpha = _shadowColor4F.a * 255; shadowFontDefinition._fontAlpha = _shadowOpacity;
shadowFontDefinition._stroke._strokeColor = shadowFontDefinition._fontFillColor; shadowFontDefinition._stroke._strokeColor = shadowFontDefinition._fontFillColor;
shadowFontDefinition._stroke._strokeAlpha = shadowFontDefinition._fontAlpha; shadowFontDefinition._stroke._strokeAlpha = shadowFontDefinition._fontAlpha;