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

[FIX] FontTest vertical alignment

This commit is contained in:
pengfei tong 2012-08-09 16:08:16 +08:00
parent bb0eaaca37
commit 11be0edb06
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ public:
vLines.clear(); vLines.clear();
} }
void buildLine(stringstream& ss, FT_Face face, int iCurXCursor, char cLastChar) { void buildLine(stringstream& ss, FT_Face face, int iCurXCursor, int iCurYCursor, char cLastChar) {
TextLine oTempLine; TextLine oTempLine;
ss << '\0'; ss << '\0';
oTempLine.sLineStr = ss.str(); oTempLine.sLineStr = ss.str();
@ -60,6 +60,7 @@ public:
oTempLine.iLineWidth = iCurXCursor - SHIFT6((face->glyph->metrics.horiAdvance + face->glyph->metrics.horiBearingX - face->glyph->metrics.width))/*-iInterval*/;//TODO interval oTempLine.iLineWidth = iCurXCursor - SHIFT6((face->glyph->metrics.horiAdvance + face->glyph->metrics.horiBearingX - face->glyph->metrics.width))/*-iInterval*/;//TODO interval
iMaxLineWidth = MAX(iMaxLineWidth, oTempLine.iLineWidth); iMaxLineWidth = MAX(iMaxLineWidth, oTempLine.iLineWidth);
ss.clear(); ss.clear();
ss.str(""); ss.str("");
vLines.push_back(oTempLine); vLines.push_back(oTempLine);
@ -68,13 +69,14 @@ public:
bool divideString(FT_Face face, const char* sText, int iMaxWidth, int iMaxHeight) { bool divideString(FT_Face face, const char* sText, int iMaxWidth, int iMaxHeight) {
const char* pText = sText; const char* pText = sText;
int iError = 0; int iError = 0;
int iCurXCursor; int iCurXCursor, iCurYCursor;
iError = FT_Load_Glyph(face, FT_Get_Char_Index(face, *pText), iError = FT_Load_Glyph(face, FT_Get_Char_Index(face, *pText),
FT_LOAD_DEFAULT); FT_LOAD_DEFAULT);
if (iError) { if (iError) {
return false; return false;
} }
iCurXCursor = -SHIFT6(face->glyph->metrics.horiBearingX); iCurXCursor = -SHIFT6(face->glyph->metrics.horiBearingX);
//init stringstream //init stringstream
stringstream ss; stringstream ss;
@ -82,7 +84,7 @@ public:
while (*pText != '\0') { while (*pText != '\0') {
if (*pText == '\n') { if (*pText == '\n') {
buildLine(ss, face, iCurXCursor, cLastCh); buildLine(ss, face, iCurXCursor, iCurYCursor, cLastCh);
pText++; pText++;
iError = FT_Load_Glyph(face, FT_Get_Char_Index(face, *pText), iError = FT_Load_Glyph(face, FT_Get_Char_Index(face, *pText),
@ -106,10 +108,9 @@ public:
if ((iMaxWidth > 0 if ((iMaxWidth > 0
&& iCurXCursor + SHIFT6(face->glyph->metrics.width) && iCurXCursor + SHIFT6(face->glyph->metrics.width)
> iMaxWidth)) { > iMaxWidth)) {
buildLine(ss, face , iCurXCursor, cLastCh); buildLine(ss, face , iCurXCursor, iCurYCursor, cLastCh);
iCurXCursor = -SHIFT6(face->glyph->metrics.horiBearingX); iCurXCursor = -SHIFT6(face->glyph->metrics.horiBearingX);
} }
cLastCh = *pText; cLastCh = *pText;
@ -122,7 +123,7 @@ public:
return false; return false;
} }
buildLine(ss,face, iCurXCursor, cLastCh); buildLine(ss,face, iCurXCursor, iCurYCursor, cLastCh);
return true; return true;
} }
@ -157,6 +158,25 @@ public:
return iRet; return iRet;
} }
int computeLineStartY( FT_Face face, CCImage::ETextAlign eAlignMask, int txtHeight, int borderHeight ){
int iRet;
if (eAlignMask == CCImage::kAlignCenter || eAlignMask == CCImage::kAlignLeft ||
eAlignMask == CCImage::kAlignRight ) {
//vertical center
iRet = (borderHeight - txtHeight)/2;
} else if (eAlignMask == CCImage::kAlignBottomRight ||
eAlignMask == CCImage::kAlignBottom ||
eAlignMask == CCImage::kAlignBottomLeft ) {
//vertical bottom
iRet = borderHeight - txtHeight;
} else {
// left or other situation
iRet = SHIFT6(face->size->metrics.ascender);
}
return iRet;
}
bool getBitmap(const char *text, int nWidth, int nHeight, CCImage::ETextAlign eAlignMask, const char * pFontName, float fontSize) { bool getBitmap(const char *text, int nWidth, int nHeight, CCImage::ETextAlign eAlignMask, const char * pFontName, float fontSize) {
FT_Face face; FT_Face face;
FT_Error iError; FT_Error iError;
@ -198,10 +218,13 @@ public:
- (face->size->metrics.descender >> 6); - (face->size->metrics.descender >> 6);
iMaxLineHeight *= vLines.size(); iMaxLineHeight *= vLines.size();
int txtHeight = iMaxLineHeight;
//compute the final line height //compute the final line height
iMaxLineHeight = MAX(iMaxLineHeight, nHeight); iMaxLineHeight = MAX(iMaxLineHeight, nHeight);
m_pData = new unsigned char[iMaxLineWidth * iMaxLineHeight*4]; m_pData = new unsigned char[iMaxLineWidth * iMaxLineHeight*4];
iCurYCursor = SHIFT6(face->size->metrics.ascender); // iCurYCursor = SHIFT6(face->size->metrics.ascender);
iCurYCursor = computeLineStartY( face, eAlignMask, txtHeight, iMaxLineHeight );
memset(m_pData,0, iMaxLineWidth * iMaxLineHeight*4); memset(m_pData,0, iMaxLineWidth * iMaxLineHeight*4);