mirror of https://github.com/axmolengine/axmol.git
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:
commit
f38bfdf212
|
@ -788,7 +788,14 @@ void Label::enableShadow(const Color4B& shadowColor /* = Color4B::BLACK */,const
|
|||
//TODO: support blur for shadow
|
||||
_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)
|
||||
{
|
||||
|
@ -801,11 +808,11 @@ void Label::enableShadow(const Color4B& shadowColor /* = Color4B::BLACK */,const
|
|||
_shadowNode->setPosition(_shadowOffset.width, _shadowOffset.height);
|
||||
}
|
||||
}
|
||||
|
||||
_shadowColor3B.r = shadowColor.r;
|
||||
_shadowColor3B.g = shadowColor.g;
|
||||
_shadowColor3B.b = shadowColor.b;
|
||||
_shadowOpacity = shadowColor.a;
|
||||
else
|
||||
{
|
||||
createShadowSpriteForSystemFont();
|
||||
}
|
||||
}
|
||||
|
||||
_shadowColor4F.r = shadowColor.r / 255.0f;
|
||||
_shadowColor4F.g = shadowColor.g / 255.0f;
|
||||
|
@ -1038,18 +1045,18 @@ void Label::createSpriteForSystemFont()
|
|||
|
||||
void Label::createShadowSpriteForSystemFont()
|
||||
{
|
||||
if (!_fontDefinition._stroke._strokeEnabled && _fontDefinition._fontFillColor == _shadowColor4F
|
||||
&& (_fontDefinition._fontAlpha == _shadowColor4F.a * 255))
|
||||
if (!_fontDefinition._stroke._strokeEnabled && _fontDefinition._fontFillColor == _shadowColor3B
|
||||
&& (_fontDefinition._fontAlpha == _shadowOpacity))
|
||||
{
|
||||
_shadowNode = Sprite::createWithTexture(_textSprite->getTexture());
|
||||
}
|
||||
else
|
||||
{
|
||||
auto shadowFontDefinition = _fontDefinition;
|
||||
shadowFontDefinition._fontFillColor.r = _shadowColor4F.r * 255;
|
||||
shadowFontDefinition._fontFillColor.g = _shadowColor4F.g * 255;
|
||||
shadowFontDefinition._fontFillColor.b = _shadowColor4F.b * 255;
|
||||
shadowFontDefinition._fontAlpha = _shadowColor4F.a * 255;
|
||||
shadowFontDefinition._fontFillColor.r = _shadowColor3B.r;
|
||||
shadowFontDefinition._fontFillColor.g = _shadowColor3B.g;
|
||||
shadowFontDefinition._fontFillColor.b = _shadowColor3B.b;
|
||||
shadowFontDefinition._fontAlpha = _shadowOpacity;
|
||||
|
||||
shadowFontDefinition._stroke._strokeColor = shadowFontDefinition._fontFillColor;
|
||||
shadowFontDefinition._stroke._strokeAlpha = shadowFontDefinition._fontAlpha;
|
||||
|
|
Loading…
Reference in New Issue