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

issue #2430:use upper letters for enum item in Image

This commit is contained in:
minggo 2013-07-25 23:09:18 +08:00
parent 323af3c889
commit b36a4f1df0
8 changed files with 65 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cocos2dx/platform/CCImage.h
View File

@ -50,7 +50,7 @@ public:
Image(); Image();
virtual ~Image(); virtual ~Image();
enum Format typedef enum Format
{ {
FORMAT_JPG, FORMAT_JPG,
FORMAT_PNG, FORMAT_PNG,
@ -66,19 +66,29 @@ public:
kFmtWebp = FORMAT_WEBP, kFmtWebp = FORMAT_WEBP,
kFmtRawData = FORMAT_RAW_DATA, kFmtRawData = FORMAT_RAW_DATA,
kFmtUnKnown = FORMAT_UNKOWN kFmtUnKnown = FORMAT_UNKOWN
}; }EImageFormat;
typedef enum typedef enum TextAlign
{ {
kAlignCenter = 0x33, ///< Horizontal center and vertical center. TEXT_ALIGN_CENTER = 0x33, ///< Horizontal center and vertical center.
kAlignTop = 0x13, ///< Horizontal center and vertical top. TEXT_ALIGN_TOP = 0x13, ///< Horizontal center and vertical top.
kAlignTopRight = 0x12, ///< Horizontal right and vertical top. TEXT_ALIGN_TOP_RIGHT = 0x12, ///< Horizontal right and vertical top.
kAlignRight = 0x32, ///< Horizontal right and vertical center. TEXT_ALIGN_RIGHT = 0x32, ///< Horizontal right and vertical center.
kAlignBottomRight = 0x22, ///< Horizontal right and vertical bottom. TEXT_ALIGN_BOTTOM_RIGHT = 0x22, ///< Horizontal right and vertical bottom.
kAlignBottom = 0x23, ///< Horizontal center and vertical bottom. TEXT_ALIGN_BOTTOM = 0x23, ///< Horizontal center and vertical bottom.
kAlignBottomLeft = 0x21, ///< Horizontal left and vertical bottom. TEXT_ALIGN_BOTTOM_LEFT = 0x21, ///< Horizontal left and vertical bottom.
kAlignLeft = 0x31, ///< Horizontal left and vertical center. TEXT_ALIGN_LEFT = 0x31, ///< Horizontal left and vertical center.
kAlignTopLeft = 0x11, ///< Horizontal left and vertical top. TEXT_ALIGN_TOP_LEFT = 0x11, ///< Horizontal left and vertical top.
kAlignCenter = TEXT_ALIGN_CENTER,
kAlignTop = TEXT_ALIGN_TOP,
kAlignTopRight = TEXT_ALIGN_TOP_RIGHT,
kAlignRight = TEXT_ALIGN_RIGHT,
kAlignBottomRight = TEXT_ALIGN_BOTTOM_RIGHT,
kAlignBottom = TEXT_ALIGN_BOTTOM,
kAlignBottomLeft = TEXT_ALIGN_BOTTOM_LEFT,
kAlignLeft = TEXT_ALIGN_LEFT,
kAlignTopLeft = TEXT_ALIGN_TOP_LEFT,
}ETextAlign; }ETextAlign;
/** /**
@ -121,7 +131,7 @@ public:
const char * pText, const char * pText,
int nWidth = 0, int nWidth = 0,
int nHeight = 0, int nHeight = 0,
ETextAlign eAlignMask = kAlignCenter, TextAlign eAlignMask = TEXT_ALIGN_CENTER,
const char * pFontName = 0, const char * pFontName = 0,
int nSize = 0); int nSize = 0);
@ -131,7 +141,7 @@ public:
const char * pText, const char * pText,
int nWidth = 0, int nWidth = 0,
int nHeight = 0, int nHeight = 0,
ETextAlign eAlignMask = kAlignCenter, TextAlign eAlignMask = TEXT_ALIGN_CENTER,
const char * pFontName = 0, const char * pFontName = 0,
int nSize = 0, int nSize = 0,
float textTintR = 1, float textTintR = 1,

8
cocos2dx/platform/android/CCImage.cpp
View File

@ -62,7 +62,7 @@ public:
bool getBitmapFromJavaShadowStroke( const char *text, bool getBitmapFromJavaShadowStroke( const char *text,
int nWidth, int nWidth,
int nHeight, int nHeight,
Image::ETextAlign eAlignMask, Image::TextAlign eAlignMask,
const char * pFontName, const char * pFontName,
float fontSize, float fontSize,
float textTintR = 1.0, float textTintR = 1.0,
@ -120,7 +120,7 @@ public:
} }
bool getBitmapFromJava(const char *text, int nWidth, int nHeight, Image::ETextAlign eAlignMask, const char * pFontName, float fontSize) bool getBitmapFromJava(const char *text, int nWidth, int nHeight, Image::TextAlign eAlignMask, const char * pFontName, float fontSize)
{ {
return getBitmapFromJavaShadowStroke( text, nWidth, nHeight, eAlignMask, pFontName, fontSize ); return getBitmapFromJavaShadowStroke( text, nWidth, nHeight, eAlignMask, pFontName, fontSize );
} }
@ -148,7 +148,7 @@ bool Image::initWithString(
const char * pText, const char * pText,
int nWidth/* = 0*/, int nWidth/* = 0*/,
int nHeight/* = 0*/, int nHeight/* = 0*/,
ETextAlign eAlignMask/* = kAlignCenter*/, TextAlign eAlignMask/* = kAlignCenter*/,
const char * pFontName/* = nil*/, const char * pFontName/* = nil*/,
int nSize/* = 0*/) int nSize/* = 0*/)
{ {
@ -182,7 +182,7 @@ bool Image::initWithStringShadowStroke(
const char * pText, const char * pText,
int nWidth , int nWidth ,
int nHeight , int nHeight ,
ETextAlign eAlignMask , TextAlign eAlignMask ,
const char * pFontName , const char * pFontName ,
int nSize , int nSize ,
float textTintR, float textTintR,

6
cocos2dx/platform/ios/CCImage.mm
View File

@ -172,7 +172,7 @@ static CGSize _calculateStringSize(NSString *str, id font, CGSize *constrainSize
#define ALIGN_CENTER 3 #define ALIGN_CENTER 3
#define ALIGN_BOTTOM 2 #define ALIGN_BOTTOM 2
static bool _initWithString(const char * pText, cocos2d::Image::ETextAlign eAlign, const char * pFontName, int nSize, tImageInfo* pInfo) static bool _initWithString(const char * pText, cocos2d::Image::TextAlign eAlign, const char * pFontName, int nSize, tImageInfo* pInfo)
{ {
bool bRet = false; bool bRet = false;
do do
@ -543,7 +543,7 @@ bool Image::initWithString(
const char * pText, const char * pText,
int nWidth /* = 0 */, int nWidth /* = 0 */,
int nHeight /* = 0 */, int nHeight /* = 0 */,
ETextAlign eAlignMask /* = kAlignCenter */, TextAlign eAlignMask /* = kAlignCenter */,
const char * pFontName /* = nil */, const char * pFontName /* = nil */,
int nSize /* = 0 */) int nSize /* = 0 */)
{ {
@ -554,7 +554,7 @@ bool Image::initWithStringShadowStroke(
const char * pText, const char * pText,
int nWidth , int nWidth ,
int nHeight , int nHeight ,
ETextAlign eAlignMask , TextAlign eAlignMask ,
const char * pFontName , const char * pFontName ,
int nSize , int nSize ,
float textTintR, float textTintR,

16
cocos2dx/platform/linux/CCImage.cpp
View File

@ -240,11 +240,11 @@ public:
/** /**
* compute the start pos of every line * compute the start pos of every line
*/ */
int computeLineStart(FT_Face face, Image::ETextAlign eAlignMask, int line) { int computeLineStart(FT_Face face, Image::TextAlign eAlignMask, int line) {
int lineWidth = textLines.at(line).lineWidth; int lineWidth = textLines.at(line).lineWidth;
if (eAlignMask == Image::kAlignCenter || eAlignMask == Image::kAlignTop || eAlignMask == Image::kAlignBottom) { if (eAlignMask == Image::TEXT_ALIGN_CENTER || eAlignMask == Image::TEXT_ALIGN_TOP || eAlignMask == Image::TEXT_ALIGN_BOTTOM) {
return (iMaxLineWidth - lineWidth) / 2; return (iMaxLineWidth - lineWidth) / 2;
} else if (eAlignMask == Image::kAlignRight || eAlignMask == Image::kAlignTopRight || eAlignMask == Image::kAlignBottomRight) { } else if (eAlignMask == Image::TEXT_ALIGN_RIGHT || eAlignMask == Image::TEXT_ALIGN_TOP_RIGHT || eAlignMask == Image::TEXT_ALIGN_BOTTOM_RIGHT) {
return (iMaxLineWidth - lineWidth); return (iMaxLineWidth - lineWidth);
} }
@ -252,12 +252,12 @@ public:
return 0; return 0;
} }
int computeLineStartY( FT_Face face, Image::ETextAlign eAlignMask, int txtHeight, int borderHeight ){ int computeLineStartY( FT_Face face, Image::TextAlign eAlignMask, int txtHeight, int borderHeight ){
int baseLinePos = ceilf(FT_MulFix( face->bbox.yMax, face->size->metrics.y_scale )/64.0f); int baseLinePos = ceilf(FT_MulFix( face->bbox.yMax, face->size->metrics.y_scale )/64.0f);
if (eAlignMask == Image::kAlignCenter || eAlignMask == Image::kAlignLeft || eAlignMask == Image::kAlignRight) { if (eAlignMask == Image::TEXT_ALIGN_CENTER || eAlignMask == Image::TEXT_ALIGN_LEFT || eAlignMask == Image::TEXT_ALIGN_RIGHT) {
//vertical center //vertical center
return (borderHeight - txtHeight) / 2 + baseLinePos; return (borderHeight - txtHeight) / 2 + baseLinePos;
} else if (eAlignMask == Image::kAlignBottomRight || eAlignMask == Image::kAlignBottom || eAlignMask == Image::kAlignBottomLeft) { } else if (eAlignMask == Image::TEXT_ALIGN_BOTTOM_RIGHT || eAlignMask == Image::TEXT_ALIGN_BOTTOM || eAlignMask == Image::TEXT_ALIGN_BOTTOM_LEFT) {
//vertical bottom //vertical bottom
return borderHeight - txtHeight + baseLinePos; return borderHeight - txtHeight + baseLinePos;
} }
@ -313,7 +313,7 @@ public:
return family_name; return family_name;
} }
bool getBitmap(const char *text, int nWidth, int nHeight, Image::ETextAlign eAlignMask, const char * pFontName, float fontSize) { bool getBitmap(const char *text, int nWidth, int nHeight, Image::TextAlign eAlignMask, const char * pFontName, float fontSize) {
if (libError) { if (libError) {
return false; return false;
} }
@ -428,7 +428,7 @@ bool Image::initWithString(
const char * pText, const char * pText,
int nWidth/* = 0*/, int nWidth/* = 0*/,
int nHeight/* = 0*/, int nHeight/* = 0*/,
ETextAlign eAlignMask/* = kAlignCenter*/, TextAlign eAlignMask/* = kAlignCenter*/,
const char * pFontName/* = nil*/, const char * pFontName/* = nil*/,
int nSize/* = 0*/) int nSize/* = 0*/)
{ {

2
cocos2dx/platform/mac/CCImage.mm
View File

@ -859,7 +859,7 @@ bool Image::initWithString(
const char * pText, const char * pText,
int nWidth, int nWidth,
int nHeight, int nHeight,
ETextAlign eAlignMask, TextAlign eAlignMask,
const char * pFontName, const char * pFontName,
int nSize) int nSize)
{ {

22
cocos2dx/platform/nacl/CCImage.cpp
View File

@ -214,7 +214,7 @@ public:
* while -1 means fail * while -1 means fail
* *
*/ */
int computeLineStart(FT_Face face, Image::ETextAlign eAlignMask, FT_UInt unicode, int computeLineStart(FT_Face face, Image::TextAlign eAlignMask, FT_UInt unicode,
int iLineIndex) int iLineIndex)
{ {
int iRet; int iRet;
@ -223,11 +223,11 @@ public:
return -1; return -1;
} }
if (eAlignMask == Image::kAlignCenter) { if (eAlignMask == Image::TEXT_ALIGN_CENTER) {
iRet = (iMaxLineWidth - vLines[iLineIndex].iLineWidth) / 2 iRet = (iMaxLineWidth - vLines[iLineIndex].iLineWidth) / 2
- SHIFT6(face->glyph->metrics.horiBearingX ); - SHIFT6(face->glyph->metrics.horiBearingX );
} else if (eAlignMask == Image::kAlignRight) { } else if (eAlignMask == Image::TEXT_ALIGN_RIGHT) {
iRet = (iMaxLineWidth - vLines[iLineIndex].iLineWidth) iRet = (iMaxLineWidth - vLines[iLineIndex].iLineWidth)
- SHIFT6(face->glyph->metrics.horiBearingX ); - SHIFT6(face->glyph->metrics.horiBearingX );
} else { } else {
@ -237,17 +237,17 @@ public:
return iRet; return iRet;
} }
int computeLineStartY(FT_Face face, Image::ETextAlign eAlignMask, int txtHeight, int borderHeight) int computeLineStartY(FT_Face face, Image::TextAlign eAlignMask, int txtHeight, int borderHeight)
{ {
int iRet = 0; int iRet = 0;
if (eAlignMask == Image::kAlignCenter || eAlignMask == Image::kAlignLeft || if (eAlignMask == Image::TEXT_ALIGN_CENTER || eAlignMask == Image::TEXT_ALIGN_LEFT ||
eAlignMask == Image::kAlignRight ) { eAlignMask == Image::TEXT_ALIGN_RIGHT ) {
//vertical center //vertical center
iRet = (borderHeight - txtHeight)/2; iRet = (borderHeight - txtHeight)/2;
} else if (eAlignMask == Image::kAlignBottomRight || } else if (eAlignMask == Image::TEXT_ALIGN_BOTTOM_RIGHT ||
eAlignMask == Image::kAlignBottom || eAlignMask == Image::TEXT_ALIGN_BOTTOM ||
eAlignMask == Image::kAlignBottomLeft ) { eAlignMask == Image::TEXT_ALIGN_BOTTOM_LEFT ) {
//vertical bottom //vertical bottom
iRet = borderHeight - txtHeight; iRet = borderHeight - txtHeight;
} }
@ -310,7 +310,7 @@ public:
return true; return true;
} }
bool renderLines(FT_Face face, Image::ETextAlign eAlignMask, int iCurYCursor) bool renderLines(FT_Face face, Image::TextAlign eAlignMask, int iCurYCursor)
{ {
size_t lines = vLines.size(); size_t lines = vLines.size();
for (size_t i = 0; i < lines; i++) for (size_t i = 0; i < lines; i++)
@ -328,7 +328,7 @@ public:
return true; return true;
} }
bool getBitmap(const char *text, int nWidth, int nHeight, Image::ETextAlign eAlignMask, const char * pFontName, float fontSize) bool getBitmap(const char *text, int nWidth, int nHeight, Image::TextAlign eAlignMask, const char * pFontName, float fontSize)
{ {
FT_Error iError; FT_Error iError;
if (libError) if (libError)

14
cocos2dx/platform/tizen/CCImage.cpp
View File

@ -240,11 +240,11 @@ public:
/** /**
* compute the start pos of every line * compute the start pos of every line
*/ */
int computeLineStart(FT_Face face, Image::ETextAlign eAlignMask, int line) { int computeLineStart(FT_Face face, Image::TextAlign eAlignMask, int line) {
int lineWidth = textLines.at(line).lineWidth; int lineWidth = textLines.at(line).lineWidth;
if (eAlignMask == Image::kAlignCenter || eAlignMask == Image::kAlignTop || eAlignMask == Image::kAlignBottom) { if (eAlignMask == Image::TEXT_ALIGN_CENTER || eAlignMask == Image::TEXT_ALIGN_TOP || eAlignMask == Image::TEXT_ALIGN_BOTTOM) {
return (iMaxLineWidth - lineWidth) / 2; return (iMaxLineWidth - lineWidth) / 2;
} else if (eAlignMask == Image::kAlignRight || eAlignMask == Image::kAlignTopRight || eAlignMask == Image::kAlignBottomRight) { } else if (eAlignMask == Image::TEXT_ALIGN_RIGHT || eAlignMask == Image::TEXT_ALIGN_TOP_RIGHT || eAlignMask == Image::TEXT_ALIGN_BOTTOM_RIGHT) {
return (iMaxLineWidth - lineWidth); return (iMaxLineWidth - lineWidth);
} }
@ -252,12 +252,12 @@ public:
return 0; return 0;
} }
int computeLineStartY( FT_Face face, Image::ETextAlign eAlignMask, int txtHeight, int borderHeight ){ int computeLineStartY( FT_Face face, Image::TextAlign eAlignMask, int txtHeight, int borderHeight ){
int baseLinePos = ceilf(FT_MulFix( face->bbox.yMax, face->size->metrics.y_scale )/64.0f); int baseLinePos = ceilf(FT_MulFix( face->bbox.yMax, face->size->metrics.y_scale )/64.0f);
if (eAlignMask == Image::kAlignCenter || eAlignMask == Image::kAlignLeft || eAlignMask == Image::kAlignRight) { if (eAlignMask == Image::TEXT_ALIGN_CENTER || eAlignMask == Image::TEXT_ALIGN_LEFT || eAlignMask == Image::TEXT_ALIGN_RIGHT) {
//vertical center //vertical center
return (borderHeight - txtHeight) / 2 + baseLinePos; return (borderHeight - txtHeight) / 2 + baseLinePos;
} else if (eAlignMask == Image::kAlignBottomRight || eAlignMask == Image::kAlignBottom || eAlignMask == Image::kAlignBottomLeft) { } else if (eAlignMask == Image::TEXT_ALIGN_BOTTOM_RIGHT || eAlignMask == Image::TEXT_ALIGN_BOTTOM || eAlignMask == Image::TEXT_ALIGN_BOTTOM_LEFT) {
//vertical bottom //vertical bottom
return borderHeight - txtHeight + baseLinePos; return borderHeight - txtHeight + baseLinePos;
} }
@ -313,7 +313,7 @@ public:
return family_name; return family_name;
} }
bool getBitmap(const char *text, int nWidth, int nHeight, Image::ETextAlign eAlignMask, const char * pFontName, float fontSize) { bool getBitmap(const char *text, int nWidth, int nHeight, Image::TextAlign eAlignMask, const char * pFontName, float fontSize) {
if (libError) { if (libError) {
return false; return false;
} }

14
cocos2dx/textures/CCTexture2D.cpp
View File

@ -459,22 +459,22 @@ bool Texture2D::initWithString(const char *text, const FontDefinition& textDefin
#endif #endif
bool bRet = false; bool bRet = false;
Image::ETextAlign eAlign; Image::TextAlign eAlign;
if (Label::VERTICAL_TEXT_ALIGNMENT_TOP == textDefinition._vertAlignment) if (Label::VERTICAL_TEXT_ALIGNMENT_TOP == textDefinition._vertAlignment)
{ {
eAlign = (Label::TEXT_ALIGNMENT_CENTER == textDefinition._alignment) ? Image::kAlignTop eAlign = (Label::TEXT_ALIGNMENT_CENTER == textDefinition._alignment) ? Image::TEXT_ALIGN_TOP
: (Label::TEXT_ALIGNMENT_LEFT == textDefinition._alignment) ? Image::kAlignTopLeft : Image::kAlignTopRight; : (Label::TEXT_ALIGNMENT_LEFT == textDefinition._alignment) ? Image::TEXT_ALIGN_TOP_LEFT : Image::TEXT_ALIGN_TOP_RIGHT;
} }
else if (Label::VERTICAL_TEXT_ALIGNMENT_CENTER == textDefinition._vertAlignment) else if (Label::VERTICAL_TEXT_ALIGNMENT_CENTER == textDefinition._vertAlignment)
{ {
eAlign = (Label::TEXT_ALIGNMENT_CENTER == textDefinition._alignment) ? Image::kAlignCenter eAlign = (Label::TEXT_ALIGNMENT_CENTER == textDefinition._alignment) ? Image::TEXT_ALIGN_CENTER
: (Label::TEXT_ALIGNMENT_LEFT == textDefinition._alignment) ? Image::kAlignLeft : Image::kAlignRight; : (Label::TEXT_ALIGNMENT_LEFT == textDefinition._alignment) ? Image::TEXT_ALIGN_LEFT : Image::TEXT_ALIGN_RIGHT;
} }
else if (Label::VERTICAL_TEXT_ALIGNMENT_BOTTOM == textDefinition._vertAlignment) else if (Label::VERTICAL_TEXT_ALIGNMENT_BOTTOM == textDefinition._vertAlignment)
{ {
eAlign = (Label::TEXT_ALIGNMENT_CENTER == textDefinition._alignment) ? Image::kAlignBottom eAlign = (Label::TEXT_ALIGNMENT_CENTER == textDefinition._alignment) ? Image::TEXT_ALIGN_BOTTOM
: (Label::TEXT_ALIGNMENT_LEFT == textDefinition._alignment) ? Image::kAlignBottomLeft : Image::kAlignBottomRight; : (Label::TEXT_ALIGNMENT_LEFT == textDefinition._alignment) ? Image::TEXT_ALIGN_BOTTOM_LEFT : Image::TEXT_ALIGN_BOTTOM_RIGHT;
} }
else else
{ {