From 043c6400376f4e5042d75c98c8d78bf38436e60f Mon Sep 17 00:00:00 2001 From: yinkaile Date: Fri, 20 Jun 2014 10:52:14 +0800 Subject: [PATCH] fixed warning and logic error --- .../cocostudio/ActionTimeline/CCFrame.cpp | 12 ++++++------ .../cocostudio/ActionTimeline/CCNodeReader.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp index 00facfb6ba..657db83656 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 && percent != 0 || _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 && percent != 0 || (_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 && percent != 0 || (_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 && percent != 0 || (_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 && percent != 0 || (_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 && percent != 0 || (_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; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp index 9991baff0b..285c96118e 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp @@ -383,9 +383,9 @@ Node* NodeReader::loadSprite(const rapidjson::Value& json) bool flipY = DICTOOL->getBooleanValue_json(json, FLIPY); if(flipX != false) - sprite->setFlipX(flipX); + sprite->setFlippedX(flipX); if(flipY != false) - sprite->setFlipY(flipY); + sprite->setFlippedY(flipY); return sprite; }