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

fix color

This commit is contained in:
geron-cn 2015-04-09 19:13:14 +08:00
parent 56bb0a68bb
commit c206725be5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp
View File

@ -690,16 +690,13 @@ void ColorFrame::onEnter(Frame *nextFrame, int currentFrameIndex)
void ColorFrame::onApply(float percent) void ColorFrame::onApply(float percent)
{ {
if (_betweenAlpha !=0 || _betweenRed != 0 || _betweenGreen != 0 || _betweenBlue != 0) if (_betweenRed != 0 || _betweenGreen != 0 || _betweenBlue != 0)
{ {
GLubyte alpha = _alpha + _betweenAlpha * percent;
Color3B color; Color3B color;
color.r = _color.r+ _betweenRed * percent; color.r = _color.r+ _betweenRed * percent;
color.g = _color.g+ _betweenGreen * percent; color.g = _color.g+ _betweenGreen * percent;
color.b = _color.b+ _betweenBlue * percent; color.b = _color.b+ _betweenBlue * percent;
_node->setOpacity(alpha);
_node->setColor(color); _node->setColor(color);
} }
} }