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

issue #18, debug

This commit is contained in:
Walzer 2010-09-07 07:39:15 +00:00
parent 641adefe1c
commit 3313d696f2
1 changed files with 58 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
cocos2dx/actions/CCIntervalAction.cpp
View File

@ -610,8 +610,14 @@ void CCSpawn::stop(void)
void CCSpawn::update(cocos2d::ccTime time) void CCSpawn::update(cocos2d::ccTime time)
{ {
m_pOne->update(time); if (m_pOne)
m_pTwo->update(time); {
m_pOne->update(time);
}
if (m_pTwo)
{
m_pTwo->update(time);
}
} }
CCIntervalAction* CCSpawn::reverse(void) CCIntervalAction* CCSpawn::reverse(void)
@ -695,7 +701,10 @@ void CCRotateTo::startWithTarget(CCNode *pTarget)
void CCRotateTo::update(cocos2d::ccTime time) void CCRotateTo::update(cocos2d::ccTime time)
{ {
m_pTarget->setRotation(m_fStartAngle + m_fDiffAngle * time); if (m_pTarget)
{
m_pTarget->setRotation(m_fStartAngle + m_fDiffAngle * time);
}
} }
// //
@ -753,7 +762,10 @@ void CCRotateBy::startWithTarget(CCNode *pTarget)
void CCRotateBy::update(cocos2d::ccTime time) void CCRotateBy::update(cocos2d::ccTime time)
{ {
// XXX: shall I add % 360 // XXX: shall I add % 360
m_pTarget->setRotation(m_fStartAngle + m_fAngle * time); if (m_pTarget)
{
m_pTarget->setRotation(m_fStartAngle + m_fAngle * time);
}
} }
CCIntervalAction* CCRotateBy::reverse(void) CCIntervalAction* CCRotateBy::reverse(void)
@ -816,8 +828,11 @@ void CCMoveTo::startWithTarget(CCNode *pTarget)
void CCMoveTo::update(cocos2d::ccTime time) void CCMoveTo::update(cocos2d::ccTime time)
{ {
m_pTarget->setPosition(ccp(m_startPosition.x + m_delta.x * time, if (m_pTarget)
m_startPosition.y + m_delta.y * time)); {
m_pTarget->setPosition(ccp(m_startPosition.x + m_delta.x * time,
m_startPosition.y + m_delta.y * time));
}
} }
// //
@ -936,11 +951,14 @@ void CCJumpBy::startWithTarget(CCNode *pTarget)
void CCJumpBy::update(cocos2d::ccTime time) void CCJumpBy::update(cocos2d::ccTime time)
{ {
// parabolic jump (since v0.8.2) // parabolic jump (since v0.8.2)
ccTime frac = fmodf(time * m_nJumps, 1.0f); if (m_pTarget)
ccTime y = m_height * 4 * frac * (1 - frac); {
y += m_delta.y * time; ccTime frac = fmodf(time * m_nJumps, 1.0f);
ccTime x = m_delta.x * time; ccTime y = m_height * 4 * frac * (1 - frac);
m_pTarget->setPosition(ccp(m_startPosition.x + x, m_startPosition.y + y)); y += m_delta.y * time;
ccTime x = m_delta.x * time;
m_pTarget->setPosition(ccp(m_startPosition.x + x, m_startPosition.y + y));
}
} }
CCIntervalAction* CCJumpBy::reverse(void) CCIntervalAction* CCJumpBy::reverse(void)
@ -1056,19 +1074,22 @@ NSObject* CCBezierBy::copyWithZone(cocos2d::NSZone *pZone)
void CCBezierBy::update(cocos2d::ccTime time) void CCBezierBy::update(cocos2d::ccTime time)
{ {
float xa = 0; if (m_pTarget)
float xb = m_sConfig.controlPoint_1.x; {
float xc = m_sConfig.controlPoint_2.x; float xa = 0;
float xd = m_sConfig.endPosition.x; float xb = m_sConfig.controlPoint_1.x;
float xc = m_sConfig.controlPoint_2.x;
float xd = m_sConfig.endPosition.x;
float ya = 0; float ya = 0;
float yb = m_sConfig.controlPoint_1.y; float yb = m_sConfig.controlPoint_1.y;
float yc = m_sConfig.controlPoint_2.y; float yc = m_sConfig.controlPoint_2.y;
float yd = m_sConfig.endPosition.y; float yd = m_sConfig.endPosition.y;
float x = bezierat(xa, xb, xc, xd, time); float x = bezierat(xa, xb, xc, xd, time);
float y = bezierat(ya, yb, yc, yd, time); float y = bezierat(ya, yb, yc, yd, time);
m_pTarget->setPosition(ccpAdd(m_startPosition, ccp(x, y))); m_pTarget->setPosition(ccpAdd(m_startPosition, ccp(x, y)));
}
} }
CCIntervalAction* CCBezierBy::reverse(void) CCIntervalAction* CCBezierBy::reverse(void)
@ -1208,8 +1229,11 @@ void CCScaleTo::startWithTarget(CCNode *pTarget)
void CCScaleTo::update(cocos2d::ccTime time) void CCScaleTo::update(cocos2d::ccTime time)
{ {
m_pTarget->setScaleX(m_fStartScaleX + m_fDeltaX * time); if (m_pTarget)
m_pTarget->setScaleY(m_fStartScaleY + m_fDeltaY * time); {
m_pTarget->setScaleX(m_fStartScaleX + m_fDeltaX * time);
m_pTarget->setScaleY(m_fStartScaleY + m_fDeltaY * time);
}
} }
// //
@ -1318,9 +1342,12 @@ NSObject* CCBlink::copyWithZone(cocos2d::NSZone *pZone)
void CCBlink::update(cocos2d::ccTime time) void CCBlink::update(cocos2d::ccTime time)
{ {
ccTime slice = 1.0f / m_nTimes; if (m_pTarget)
ccTime m = fmodf(time, slice); {
m_pTarget->setIsVisible(m > slice / 2 ? true : false); ccTime slice = 1.0f / m_nTimes;
ccTime m = fmodf(time, slice);
m_pTarget->setIsVisible(m > slice / 2 ? true : false);
}
} }
CCIntervalAction* CCBlink::reverse(void) CCIntervalAction* CCBlink::reverse(void)
@ -1758,7 +1785,10 @@ void CCReverseTime::stop(void)
void CCReverseTime::update(cocos2d::ccTime time) void CCReverseTime::update(cocos2d::ccTime time)
{ {
m_pOther->update(1 - time); if (m_pOther)
{
m_pOther->update(1 - time);
}
} }
CCIntervalAction* CCReverseTime::reverse(void) CCIntervalAction* CCReverseTime::reverse(void)