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

fix a bug of CCProgressTimer when upgrade to rc3

This commit is contained in:
minggo 2011-07-06 16:29:56 +08:00
parent 6129e33794
commit f894e00f27
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos2dx/misc_nodes/CCProgressTimer.cpp
View File

@ -96,7 +96,7 @@ void CCProgressTimer::setPercentage(float fPercentage)
{ {
if (m_fPercentage != fPercentage) if (m_fPercentage != fPercentage)
{ {
m_fPercentage = clampf(m_fPercentage, 0, 100); m_fPercentage = clampf(fPercentage, 0, 100);
updateProgress(); updateProgress();
} }
} }
@ -164,7 +164,7 @@ ccVertex2F CCProgressTimer::vertexFromTexCoord(cocos2d::CCPoint texCoord)
void CCProgressTimer::updateColor(void) void CCProgressTimer::updateColor(void)
{ {
GLbyte op = m_pSprite->getOpacity(); GLubyte op = m_pSprite->getOpacity();
ccColor3B c3b = m_pSprite->getColor(); ccColor3B c3b = m_pSprite->getColor();
ccColor4B color = {c3b.r, c3b.g, c3b.b, op}; ccColor4B color = {c3b.r, c3b.g, c3b.b, op};

3
cocos2dx/textures/CCTextureAtlas.cpp
View File

@ -44,6 +44,9 @@ CCTextureAtlas::CCTextureAtlas()
:m_pIndices(NULL) :m_pIndices(NULL)
,m_pTexture(NULL) ,m_pTexture(NULL)
,m_pQuads(NULL) ,m_pQuads(NULL)
#if CC_USES_VBO
, m_bDirty(false)
#endif
{} {}
CCTextureAtlas::~CCTextureAtlas() CCTextureAtlas::~CCTextureAtlas()