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

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

Label:disableEffect(LabelEffect::XXXX) support disable all effect.
This commit is contained in:
minggo 2015-04-17 15:22:56 +08:00
parent 5d5fa3d618 0ac99002d5
commit 08df26f36a
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/2d/CCLabel.cpp
View File

@ -857,6 +857,13 @@ void Label::disableEffect(LabelEffect effect)
updateShaderProgram(); updateShaderProgram();
} }
break; break;
case LabelEffect::ALL:
{
disableEffect(LabelEffect::SHADOW);
disableEffect(LabelEffect::GLOW);
disableEffect(LabelEffect::OUTLINE);
}
break;
default: default:
break; break;
} }

1
cocos/2d/CCLabel.h
View File

@ -323,6 +323,7 @@ public:
/** /**
* Disable all effect to Label. * Disable all effect to Label.
* @warning Please use disableEffect(LabelEffect::ALL) instead of this API.
*/ */
virtual void disableEffect(); virtual void disableEffect();

3
cocos/base/ccTypes.h
View File

@ -556,7 +556,8 @@ enum class LabelEffect {
NORMAL, NORMAL,
OUTLINE, OUTLINE,
SHADOW, SHADOW,
GLOW GLOW,
ALL
}; };
/** @struct Acceleration /** @struct Acceleration