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

Merge pull request #3263 from 2youyouo2/Fix_3.0 

Fix armature supper fast
This commit is contained in:
James Chen 2013-07-25 19:58:22 -07:00
parent 43f9ebafac 7c4460f9e0
commit d882fc3ef0
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/CCArmature/animation/CCTween.cpp
View File

@ -94,11 +94,11 @@ bool Tween::init(Bone *bone)
}
void Tween::play(MovementBoneData *_movementBoneData, int _durationTo, int _durationTween, int _loop, int _tweenEasing)
void Tween::play(MovementBoneData *movementBoneData, int durationTo, int durationTween, int loop, int tweenEasing)
{
ProcessBase::play(NULL, _durationTo, _durationTween, _loop, _tweenEasing);
ProcessBase::play(NULL, durationTo, durationTween, loop, tweenEasing);
_loopType = (AnimationType)_loop;
_loopType = (AnimationType)loop;
_currentKeyFrame = NULL;
_isTweenKeyFrame = false;
@ -107,14 +107,14 @@ void Tween::play(MovementBoneData *_movementBoneData, int _durationTo, int _dura
betweenDuration = 0;
_toIndex = 0;
setMovementBoneData(_movementBoneData);
setMovementBoneData(movementBoneData);
if (_movementBoneData->frameList.count() == 1)
{
_loopType = SINGLE_FRAME;
FrameData *_nextKeyFrame = _movementBoneData->getFrameData(0);
if(_durationTo == 0)
if(durationTo == 0)
{
setBetween(_nextKeyFrame, _nextKeyFrame);
}
@ -130,7 +130,7 @@ void Tween::play(MovementBoneData *_movementBoneData, int _durationTo, int _dura
}
else if (_movementBoneData->frameList.count() > 1)
{
if (_loop)
if (loop)
{
_loopType = ANIMATION_TO_LOOP_BACK;
_rawDuration = _movementBoneData->duration;
@ -141,9 +141,9 @@ void Tween::play(MovementBoneData *_movementBoneData, int _durationTo, int _dura
_rawDuration = _movementBoneData->duration - 1;
}
_durationTween = _durationTween * _movementBoneData->scale;
_durationTween = durationTween * _movementBoneData->scale;
if (_loop && _movementBoneData->delay != 0)
if (loop && _movementBoneData->delay != 0)
{
setBetween(_tweenData, tweenNodeTo(updateFrameData(1 - _movementBoneData->delay), _between));
@ -333,6 +333,7 @@ void Tween::arriveKeyFrame(FrameData *keyFrameData)
FrameData *Tween::tweenNodeTo(float percent, FrameData *node)
{
node = node == NULL ? _tweenData : node;
node->x = _from->x + percent * _between->x;