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

label:rename some API for clearly.

This commit is contained in:
Dhilan007 2014-03-13 20:52:33 +08:00
parent bc68c6b629
commit 62d0fa8564
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCFontAtlasCache.cpp
View File

@ -46,7 +46,7 @@ FontAtlas * FontAtlasCache::getFontAtlasTTF(const TTFConfig & config)
int fontSize = config.fontSize;
if (useDistanceField)
{
fontSize = Label::DefultFontSize;
fontSize = Label::DistanceFieldFontSize;
}
std::string atlasName = generateFontName(config.fontFilePath, fontSize, GlyphCollection::DYNAMIC, useDistanceField);

32
cocos/2d/CCLabel.cpp
View File

@ -36,7 +36,7 @@
NS_CC_BEGIN
const int Label::DefultFontSize = 50;
const int Label::DistanceFieldFontSize = 50;
Label* Label::create()
{
@ -213,7 +213,7 @@ bool Label::setCharMap(const std::string& plistFile)
return false;
}
initWithFontAtlas(newAtlas);
setFontAtlas(newAtlas);
_currentLabelType = LabelType::CHARMAP;
return true;
@ -229,7 +229,7 @@ bool Label::setCharMap(Texture2D* texture, int itemWidth, int itemHeight, int st
return false;
}
initWithFontAtlas(newAtlas);
setFontAtlas(newAtlas);
_currentLabelType = LabelType::CHARMAP;
return true;
@ -245,7 +245,7 @@ bool Label::setCharMap(const std::string& charMapFile, int itemWidth, int itemHe
return false;
}
initWithFontAtlas(newAtlas);
setFontAtlas(newAtlas);
_currentLabelType = LabelType::CHARMAP;
return true;
@ -327,7 +327,7 @@ void Label::reset()
CC_SAFE_RELEASE_NULL(_reusedLetter);
}
void Label::initProgram()
void Label::configureShaderProgram()
{
switch (_currLabelEffect)
{
@ -354,12 +354,12 @@ void Label::initProgram()
_uniformEffectColor = glGetUniformLocation(_shaderProgram->getProgram(), "v_effectColor");
}
bool Label::initWithFontAtlas(FontAtlas* atlas,bool distanceFieldEnabled /* = false */, bool useA8Shader /* = false */)
void Label::setFontAtlas(FontAtlas* atlas,bool distanceFieldEnabled /* = false */, bool useA8Shader /* = false */)
{
if (atlas == _fontAtlas)
{
FontAtlasCache::releaseFontAtlas(atlas);
return true;
return;
}
if (_fontAtlas)
@ -391,9 +391,7 @@ bool Label::initWithFontAtlas(FontAtlas* atlas,bool distanceFieldEnabled /* = fa
_useDistanceField = distanceFieldEnabled;
_useA8Shader = useA8Shader;
_currLabelEffect = LabelEffect::NORMAL;
initProgram();
return true;
configureShaderProgram();
}
bool Label::setTTFConfig(const TTFConfig& ttfConfig)
@ -413,14 +411,14 @@ bool Label::setTTFConfig(const TTFConfig& ttfConfig)
_useDistanceField = false;
_useA8Shader = false;
_currLabelEffect = LabelEffect::OUTLINE;
initProgram();
configureShaderProgram();
}
else if(ttfConfig.distanceFieldEnabled)
{
this->setFontScale(1.0f * ttfConfig.fontSize / DefultFontSize);
this->setFontScale(1.0f * ttfConfig.fontSize / DistanceFieldFontSize);
}
initWithFontAtlas(newAtlas,ttfConfig.distanceFieldEnabled,true);
setFontAtlas(newAtlas,ttfConfig.distanceFieldEnabled,true);
_currentLabelType = LabelType::TTF;
@ -437,7 +435,7 @@ bool Label::setBMFontFilePath(const std::string& bmfontFilePath, const Point& im
return false;
}
initWithFontAtlas(newAtlas);
setFontAtlas(newAtlas);
_currentLabelType = LabelType::BMFONT;
return true;
@ -756,7 +754,7 @@ void Label::enableGlow(const Color3B& glowColor)
return;
_currLabelEffect = LabelEffect::GLOW;
_effectColor = glowColor;
initProgram();
configureShaderProgram();
}
void Label::enableOutline(const Color4B& outlineColor,int outlineSize /* = 1 */)
@ -772,7 +770,7 @@ void Label::enableOutline(const Color4B& outlineColor,int outlineSize /* = 1 */)
auto config = _fontConfig;
config.outlineSize = outlineSize;
setTTFConfig(config);
initProgram();
configureShaderProgram();
}
}
_fontDefinition._stroke._strokeEnabled = true;
@ -809,7 +807,7 @@ void Label::disableEffect()
setTTFConfig(_fontConfig);
}
_currLabelEffect = LabelEffect::NORMAL;
initProgram();
configureShaderProgram();
_contentDirty = true;
}

6
cocos/2d/CCLabel.h
View File

@ -78,7 +78,7 @@ typedef struct _ttfConfig
class CC_DLL Label : public SpriteBatchNode, public LabelProtocol
{
public:
static const int DefultFontSize;
static const int DistanceFieldFontSize;
static Label* create();
@ -259,7 +259,7 @@ protected:
*/
virtual ~Label();
virtual bool initWithFontAtlas(FontAtlas* atlas,bool distanceFieldEnabled = false, bool useA8Shader = false);
virtual void setFontAtlas(FontAtlas* atlas,bool distanceFieldEnabled = false, bool useA8Shader = false);
bool recordLetterInfo(const cocos2d::Point& point,const FontLetterDefinition& letterDef, int spriteIndex);
bool recordPlaceholderInfo(int spriteIndex);
@ -277,7 +277,7 @@ protected:
virtual void updateColor() override;
virtual void initProgram();
virtual void configureShaderProgram();
void drawShadowWithoutBlur();