From b323f5772efac4de54f11f92539f6ff762eb5b5d Mon Sep 17 00:00:00 2001 From: 2youyou2 Date: Wed, 18 Jun 2014 14:21:33 +0800 Subject: [PATCH] optimize frame --- .../cocostudio/ActionTimeline/CCFrame.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp index 9521700b8b..00facfb6ba 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp @@ -175,7 +175,7 @@ void RotationFrame::onEnter(Frame *nextFrame) void RotationFrame::apply(float percent) { - if (_tween && _betwennRotation != 0) + if (_tween && percent != 0 || _betwennRotation != 0) { float rotation = _rotation + percent * _betwennRotation; _node->setRotation(rotation); @@ -227,7 +227,7 @@ void SkewFrame::onEnter(Frame *nextFrame) void SkewFrame::apply(float percent) { - if (_tween && (_betweenSkewX != 0 || _betweenSkewY != 0)) + if (_tween && percent != 0 || (_betweenSkewX != 0 || _betweenSkewY != 0)) { float skewx = _skewX + percent * _betweenSkewX; float skewy = _skewY + percent * _betweenSkewY; @@ -282,7 +282,7 @@ void RotationSkewFrame::onEnter(Frame *nextFrame) void RotationSkewFrame::apply(float percent) { - if (_tween && (_betweenSkewX != 0 || _betweenSkewY != 0)) + if (_tween && percent != 0 || (_betweenSkewX != 0 || _betweenSkewY != 0)) { float skewx = _skewX + percent * _betweenSkewX; float skewy = _skewY + percent * _betweenSkewY; @@ -335,7 +335,7 @@ void PositionFrame::onEnter(Frame *nextFrame) void PositionFrame::apply(float percent) { - if (_tween && (_betweenX != 0 || _betweenY != 0)) + if (_tween && percent != 0 || (_betweenX != 0 || _betweenY != 0)) { Point p; p.x = _position.x + _betweenX * percent; @@ -389,7 +389,7 @@ void ScaleFrame::onEnter(Frame *nextFrame) void ScaleFrame::apply(float percent) { - if (_tween && (_betweenScaleX != 0 || _betweenScaleY != 0)) + if (_tween && percent != 0 || (_betweenScaleX != 0 || _betweenScaleY != 0)) { float scaleX = _scaleX + _betweenScaleX * percent; float scaleY = _scaleY + _betweenScaleY * percent; @@ -523,7 +523,7 @@ void ColorFrame::onEnter(Frame *nextFrame) void ColorFrame::apply(float percent) { - if (_tween && (_betweenAlpha !=0 || _betweenRed != 0 || _betweenGreen != 0 || _betweenBlue != 0)) + if (_tween && percent != 0 || (_betweenAlpha !=0 || _betweenRed != 0 || _betweenGreen != 0 || _betweenBlue != 0)) { GLubyte alpha = _alpha + _betweenAlpha * percent;