зеркало из https://github.com/microsoft/cocos2d-x.git
remove unneeded empty line.
This commit is contained in:
Родитель
53be67c653
Коммит
f5afa09de1
|
@ -35,10 +35,8 @@
|
|||
NS_CC_BEGIN
|
||||
|
||||
class CC_DLL FontAtlasCache
|
||||
{
|
||||
|
||||
{
|
||||
public:
|
||||
|
||||
static FontAtlas * getFontAtlasTTF(const std::string& fontFileName, int size, GlyphCollection glyphs, const char *customGlyphs = 0, bool useDistanceField = false);
|
||||
static FontAtlas * getFontAtlasFNT(const std::string& fontFileName);
|
||||
|
||||
|
@ -48,8 +46,7 @@ public:
|
|||
|
||||
static bool releaseFontAtlas(FontAtlas *atlas);
|
||||
|
||||
private:
|
||||
|
||||
private:
|
||||
static std::string generateFontName(const std::string& fontFileName, int size, GlyphCollection theGlyphs, bool useDistanceField);
|
||||
static std::unordered_map<std::string, FontAtlas *> _atlasMap;
|
||||
};
|
||||
|
|
|
@ -32,10 +32,8 @@
|
|||
NS_CC_BEGIN
|
||||
|
||||
class FontCharMap : public Font
|
||||
{
|
||||
|
||||
{
|
||||
public:
|
||||
|
||||
static FontCharMap * create(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap);
|
||||
static FontCharMap * create(Texture2D* texture, int itemWidth, int itemHeight, int startCharMap);
|
||||
static FontCharMap * create(const std::string& plistFile);
|
||||
|
@ -44,8 +42,7 @@ public:
|
|||
virtual Rect getRectForChar(unsigned short theChar) const override;
|
||||
virtual FontAtlas *createFontAtlas() override;
|
||||
|
||||
protected:
|
||||
|
||||
protected:
|
||||
FontCharMap(Texture2D* texture,int itemWidth, int itemHeight, int startCharMap) :
|
||||
_texture(texture),_itemWidth(itemWidth),_itemHeight(itemHeight),_mapStartChar(startCharMap),_charRect(0,0,itemWidth,itemHeight){}
|
||||
/**
|
||||
|
@ -55,7 +52,6 @@ protected:
|
|||
virtual ~FontCharMap();
|
||||
|
||||
private:
|
||||
|
||||
Texture2D* _texture;
|
||||
int _mapStartChar;
|
||||
int _itemWidth;
|
||||
|
|
|
@ -353,7 +353,7 @@ bool LabelTextFormatter::createStringSprites(LabelTextFormatProtocol *theLabel)
|
|||
|
||||
|
||||
Point fontPos = Point((float)nextFontPositionX + charXOffset + charRect.size.width * 0.5f + kerningAmount,
|
||||
(float)nextFontPositionY + yOffset - charRect.size.height * 0.5f);
|
||||
(float)nextFontPositionY + yOffset - charRect.size.height * 0.5f);
|
||||
|
||||
if( theLabel->recordLetterInfo(CC_POINT_PIXELS_TO_POINTS(fontPos),c,i) == false)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче