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

issue #2129: FontDefinition* --> const FontDefinition&

This commit is contained in:
James Chen 2013-07-08 15:18:16 +08:00
parent fe2a3c3d69
commit d64fb7339c
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
cocos2dx/textures/CCTexture2D.cpp
View File

@ -457,7 +457,7 @@ bool Texture2D::initWithString(const char *text, const char *fontName, float fon
tempDef._vertAlignment = vAlignment; tempDef._vertAlignment = vAlignment;
tempDef._fontFillColor = Color3B::white; tempDef._fontFillColor = Color3B::white;
return initWithString(text, &tempDef); return initWithString(text, tempDef);
#else #else
@ -510,32 +510,32 @@ bool Texture2D::initWithString(const char *text, const char *fontName, float fon
} }
bool Texture2D::initWithString(const char *text, FontDefinition *textDefinition) bool Texture2D::initWithString(const char *text, const FontDefinition& textDefinition)
{ {
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#if CC_ENABLE_CACHE_TEXTURE_DATA #if CC_ENABLE_CACHE_TEXTURE_DATA
// cache the texture data // cache the texture data
VolatileTexture::addStringTexture(this, text, textDefinition->_dimensions, textDefinition->_alignment, textDefinition->_vertAlignment, textDefinition->_fontName.c_str(), textDefinition->_fontSize); VolatileTexture::addStringTexture(this, text, textDefinition._dimensions, textDefinition._alignment, textDefinition._vertAlignment, textDefinition._fontName.c_str(), textDefinition._fontSize);
#endif #endif
bool bRet = false; bool bRet = false;
Image::ETextAlign eAlign; Image::ETextAlign eAlign;
if (kVerticalTextAlignmentTop == textDefinition->_vertAlignment) if (kVerticalTextAlignmentTop == textDefinition._vertAlignment)
{ {
eAlign = (kTextAlignmentCenter == textDefinition->_alignment) ? Image::kAlignTop eAlign = (kTextAlignmentCenter == textDefinition._alignment) ? Image::kAlignTop
: (kTextAlignmentLeft == textDefinition->_alignment) ? Image::kAlignTopLeft : Image::kAlignTopRight; : (kTextAlignmentLeft == textDefinition._alignment) ? Image::kAlignTopLeft : Image::kAlignTopRight;
} }
else if (kVerticalTextAlignmentCenter == textDefinition->_vertAlignment) else if (kVerticalTextAlignmentCenter == textDefinition._vertAlignment)
{ {
eAlign = (kTextAlignmentCenter == textDefinition->_alignment) ? Image::kAlignCenter eAlign = (kTextAlignmentCenter == textDefinition._alignment) ? Image::kAlignCenter
: (kTextAlignmentLeft == textDefinition->_alignment) ? Image::kAlignLeft : Image::kAlignRight; : (kTextAlignmentLeft == textDefinition._alignment) ? Image::kAlignLeft : Image::kAlignRight;
} }
else if (kVerticalTextAlignmentBottom == textDefinition->_vertAlignment) else if (kVerticalTextAlignmentBottom == textDefinition._vertAlignment)
{ {
eAlign = (kTextAlignmentCenter == textDefinition->_alignment) ? Image::kAlignBottom eAlign = (kTextAlignmentCenter == textDefinition._alignment) ? Image::kAlignBottom
: (kTextAlignmentLeft == textDefinition->_alignment) ? Image::kAlignBottomLeft : Image::kAlignBottomRight; : (kTextAlignmentLeft == textDefinition._alignment) ? Image::kAlignBottomLeft : Image::kAlignBottomRight;
} }
else else
{ {
@ -550,13 +550,13 @@ bool Texture2D::initWithString(const char *text, FontDefinition *textDefinition)
float shadowBlur = 0.0f; float shadowBlur = 0.0f;
float shadowOpacity = 0.0f; float shadowOpacity = 0.0f;
if ( textDefinition->_shadow._shadowEnabled ) if ( textDefinition._shadow._shadowEnabled )
{ {
shadowEnabled = true; shadowEnabled = true;
shadowDX = textDefinition->_shadow._shadowOffset.width; shadowDX = textDefinition._shadow._shadowOffset.width;
shadowDY = textDefinition->_shadow._shadowOffset.height; shadowDY = textDefinition._shadow._shadowOffset.height;
shadowBlur = textDefinition->_shadow._shadowBlur; shadowBlur = textDefinition._shadow._shadowBlur;
shadowOpacity = textDefinition->_shadow._shadowOpacity; shadowOpacity = textDefinition._shadow._shadowOpacity;
} }
// handle stroke parameters // handle stroke parameters
@ -566,13 +566,13 @@ bool Texture2D::initWithString(const char *text, FontDefinition *textDefinition)
float strokeColorB = 0.0f; float strokeColorB = 0.0f;
float strokeSize = 0.0f; float strokeSize = 0.0f;
if ( textDefinition->_stroke._strokeEnabled ) if ( textDefinition._stroke._strokeEnabled )
{ {
strokeEnabled = true; strokeEnabled = true;
strokeColorR = textDefinition->_stroke._strokeColor.r / 255.0f; strokeColorR = textDefinition._stroke._strokeColor.r / 255.0f;
strokeColorG = textDefinition->_stroke._strokeColor.g / 255.0f; strokeColorG = textDefinition._stroke._strokeColor.g / 255.0f;
strokeColorB = textDefinition->_stroke._strokeColor.b / 255.0f; strokeColorB = textDefinition._stroke._strokeColor.b / 255.0f;
strokeSize = textDefinition->_stroke._strokeSize; strokeSize = textDefinition._stroke._strokeSize;
} }
Image* pImage = new Image(); Image* pImage = new Image();
@ -581,14 +581,14 @@ bool Texture2D::initWithString(const char *text, FontDefinition *textDefinition)
CC_BREAK_IF(NULL == pImage); CC_BREAK_IF(NULL == pImage);
bRet = pImage->initWithStringShadowStroke(text, bRet = pImage->initWithStringShadowStroke(text,
(int)textDefinition->_dimensions.width, (int)textDefinition._dimensions.width,
(int)textDefinition->_dimensions.height, (int)textDefinition._dimensions.height,
eAlign, eAlign,
textDefinition->_fontName.c_str(), textDefinition._fontName.c_str(),
textDefinition->_fontSize, textDefinition._fontSize,
textDefinition->_fontFillColor.r / 255.0f, textDefinition._fontFillColor.r / 255.0f,
textDefinition->_fontFillColor.g / 255.0f, textDefinition._fontFillColor.g / 255.0f,
textDefinition->_fontFillColor.b / 255.0f, textDefinition._fontFillColor.b / 255.0f,
shadowEnabled, shadowEnabled,
shadowDX, shadowDX,
shadowDY, shadowDY,

2
cocos2dx/textures/CCTexture2D.h
View File

@ -136,7 +136,7 @@ public:
/** Initializes a texture from a string with font name and font size */ /** Initializes a texture from a string with font name and font size */
bool initWithString(const char *text, const char *fontName, float fontSize); bool initWithString(const char *text, const char *fontName, float fontSize);
/** Initializes a texture from a string using a text definition*/ /** Initializes a texture from a string using a text definition*/
bool initWithString(const char *text, FontDefinition *textDefinition); bool initWithString(const char *text, const FontDefinition& textDefinition);
/** Initializes a texture from a PVR file */ /** Initializes a texture from a PVR file */
bool initWithPVRFile(const char* file); bool initWithPVRFile(const char* file);