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

issue #1470:fix more logical errors

This commit is contained in:
minggo 2012-09-18 17:55:03 +08:00
parent 8832b8e78d
commit 4bc5e9e415
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/CCBReader/CCBAnimationManager.cpp
View File

@ -398,11 +398,11 @@ CCActionInterval* CCBAnimationManager::getEaseAction(CCActionInterval *pAction,
} }
else if (nEasingType == kCCBKeyframeEasingBounceOut) else if (nEasingType == kCCBKeyframeEasingBounceOut)
{ {
return CCEaseBackOut::create(pAction); return CCEaseBounceOut::create(pAction);
} }
else if (nEasingType == kCCBKeyframeEasingBounceInOut) else if (nEasingType == kCCBKeyframeEasingBounceInOut)
{ {
return CCEaseBackInOut::create(pAction); return CCEaseBounceInOut::create(pAction);
} }
else if (nEasingType == kCCBKeyframeEasingElasticIn) else if (nEasingType == kCCBKeyframeEasingElasticIn)
{ {
@ -677,7 +677,8 @@ void CCBRotateTo::startWithTarget(CCNode *pNode)
void CCBRotateTo::update(float time) void CCBRotateTo::update(float time)
{ {
m_pTarget->setRotation(mStartAngle + mDstAngle * time); m_pTarget->setRotation(mStartAngle + (mDiffAngle * time))
;
} }
NS_CC_EXT_END NS_CC_EXT_END

20
extensions/CCBReader/CCNodeLoader.cpp
View File

@ -410,15 +410,7 @@ float * CCNodeLoader::parsePropTypeScaleLock(CCNode * pNode, CCNode * pParent, C
int type = pCCBReader->readInt(false); int type = pCCBReader->readInt(false);
if (type == kCCBScaleTypeMultiplyResolution) setRelativeScale(pNode, x, y, type, pPropertyName);
{
x *= pCCBReader->getResolutionScale();
y *= pCCBReader->getResolutionScale();
}
float * scaleLock = new float[2];
scaleLock[0] = x;
scaleLock[1] = y;
if (pCCBReader->getAnimatedProperties()->find(pPropertyName) != pCCBReader->getAnimatedProperties()->end()) if (pCCBReader->getAnimatedProperties()->find(pPropertyName) != pCCBReader->getAnimatedProperties()->end())
{ {
@ -428,6 +420,16 @@ float * CCNodeLoader::parsePropTypeScaleLock(CCNode * pNode, CCNode * pParent, C
NULL); NULL);
pCCBReader->getAnimationManager()->setBaseValue(baseValue, pNode, pPropertyName); pCCBReader->getAnimationManager()->setBaseValue(baseValue, pNode, pPropertyName);
} }
if (type == kCCBScaleTypeMultiplyResolution)
{
x *= pCCBReader->getResolutionScale();
y *= pCCBReader->getResolutionScale();
}
float * scaleLock = new float[2];
scaleLock[0] = x;
scaleLock[1] = y;
return scaleLock; return scaleLock;
} }