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

remove unneeded empty line.

This commit is contained in:
Dhilan007 2014-01-17 09:46:59 +08:00
parent 53be67c653
commit f5afa09de1
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/2d/CCFontAtlasCache.h
View File

@ -36,9 +36,7 @@ NS_CC_BEGIN
class CC_DLL FontAtlasCache class CC_DLL FontAtlasCache
{ {
public: public:
static FontAtlas * getFontAtlasTTF(const std::string& fontFileName, int size, GlyphCollection glyphs, const char *customGlyphs = 0, bool useDistanceField = false); 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); static FontAtlas * getFontAtlasFNT(const std::string& fontFileName);
@ -49,7 +47,6 @@ public:
static bool releaseFontAtlas(FontAtlas *atlas); static bool releaseFontAtlas(FontAtlas *atlas);
private: private:
static std::string generateFontName(const std::string& fontFileName, int size, GlyphCollection theGlyphs, bool useDistanceField); static std::string generateFontName(const std::string& fontFileName, int size, GlyphCollection theGlyphs, bool useDistanceField);
static std::unordered_map<std::string, FontAtlas *> _atlasMap; static std::unordered_map<std::string, FontAtlas *> _atlasMap;
}; };

4
cocos/2d/CCFontCharMap.h
View File

@ -33,9 +33,7 @@ NS_CC_BEGIN
class FontCharMap : public Font class FontCharMap : public Font
{ {
public: public:
static FontCharMap * create(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap); 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(Texture2D* texture, int itemWidth, int itemHeight, int startCharMap);
static FontCharMap * create(const std::string& plistFile); static FontCharMap * create(const std::string& plistFile);
@ -45,7 +43,6 @@ public:
virtual FontAtlas *createFontAtlas() override; virtual FontAtlas *createFontAtlas() override;
protected: protected:
FontCharMap(Texture2D* texture,int itemWidth, int itemHeight, int startCharMap) : FontCharMap(Texture2D* texture,int itemWidth, int itemHeight, int startCharMap) :
_texture(texture),_itemWidth(itemWidth),_itemHeight(itemHeight),_mapStartChar(startCharMap),_charRect(0,0,itemWidth,itemHeight){} _texture(texture),_itemWidth(itemWidth),_itemHeight(itemHeight),_mapStartChar(startCharMap),_charRect(0,0,itemWidth,itemHeight){}
/** /**
@ -55,7 +52,6 @@ protected:
virtual ~FontCharMap(); virtual ~FontCharMap();
private: private:
Texture2D* _texture; Texture2D* _texture;
int _mapStartChar; int _mapStartChar;
int _itemWidth; int _itemWidth;