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

issue #5541: change RotateTo/RotateBy for Physics.

This commit is contained in:
boyu0 2014-06-20 18:40:21 +08:00
parent d7e7a73fec
commit 2fc8889791
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cocos/2d/CCActionInterval.cpp
View File

@ -828,8 +828,19 @@ void RotateTo::update(float time)
{
if (_target)
{
_target->setRotationSkewX(_startAngleX + _diffAngleX * time);
_target->setRotationSkewY(_startAngleY + _diffAngleY * time);
#if CC_USE_PHYSICS
if (_target->getPhysicsBody() != nullptr && _startAngleX == _startAngleY && _diffAngleX == _diffAngleY)
{
_target->setRotation(_startAngleX + _diffAngleX * time);
}
else
{
#endif // CC_USE_PHYSICS
_target->setRotationSkewX(_startAngleX + _diffAngleX * time);
_target->setRotationSkewY(_startAngleY + _diffAngleY * time);
#if CC_USE_PHYSICS
}
#endif // CC_USE_PHYSICS
}
}
@ -952,8 +963,19 @@ void RotateBy::update(float time)
}
else
{
_target->setRotationSkewX(_startAngleZ_X + _angleZ_X * time);
_target->setRotationSkewY(_startAngleZ_Y + _angleZ_Y * time);
#if CC_USE_PHYSICS
if (_target->getPhysicsBody() != nullptr && _startAngleZ_X == _startAngleZ_Y && _angleZ_X == _angleZ_Y)
{
_target->setRotation(_startAngleZ_X + _angleZ_X * time);
}
else
{
#endif // CC_USE_PHYSICS
_target->setRotationSkewX(_startAngleZ_X + _angleZ_X * time);
_target->setRotationSkewY(_startAngleZ_Y + _angleZ_Y * time);
#if CC_USE_PHYSICS
}
#endif // CC_USE_PHYSICS
}
}
}