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

Merge pull request #9037 from G17hao/patch-8 

Update CCBone.cpp
This commit is contained in:
minggo 2014-11-13 18:46:48 +08:00
parent d965062866 c7f5c3052d
commit d6eea4dc3c
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cocos/editor-support/cocostudio/CCBone.cpp
View File

@ -188,21 +188,20 @@ void Bone::update(float delta)
if (_boneTransformDirty) if (_boneTransformDirty)
{ {
_worldInfo->copy(_tweenData);
if (_dataVersion >= VERSION_COMBINED) if (_dataVersion >= VERSION_COMBINED)
{ {
TransformHelp::nodeConcat(*_tweenData, *_boneData); TransformHelp::nodeConcat(*_worldInfo, *_boneData);
_tweenData->scaleX -= 1; _worldInfo->scaleX -= 1;
_tweenData->scaleY -= 1; _worldInfo->scaleY -= 1;
} }
_worldInfo->copy(_tweenData); _worldInfo->x = _worldInfo->x + _position.x;
_worldInfo->y = _worldInfo->y + _position.y;
_worldInfo->x = _tweenData->x + _position.x; _worldInfo->scaleX = _worldInfo->scaleX * _scaleX;
_worldInfo->y = _tweenData->y + _position.y; _worldInfo->scaleY = _worldInfo->scaleY * _scaleY;
_worldInfo->scaleX = _tweenData->scaleX * _scaleX; _worldInfo->skewX = _worldInfo->skewX + _skewX + CC_DEGREES_TO_RADIANS(_rotationZ_X);
_worldInfo->scaleY = _tweenData->scaleY * _scaleY; _worldInfo->skewY = _worldInfo->skewY + _skewY - CC_DEGREES_TO_RADIANS(_rotationZ_Y);
_worldInfo->skewX = _tweenData->skewX + _skewX + CC_DEGREES_TO_RADIANS(_rotationZ_X);
_worldInfo->skewY = _tweenData->skewY + _skewY - CC_DEGREES_TO_RADIANS(_rotationZ_Y);
if(_parentBone) if(_parentBone)
{ {