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

Reconstruct ColorFrame.

This commit is contained in:
pipu 2015-03-23 13:37:24 +08:00
parent 341c560378
commit c068e60aa6
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp
View File

@ -350,12 +350,10 @@ Frame* ActionTimelineCache::loadColorFrame(const rapidjson::Value& json)
{ {
ColorFrame* frame = ColorFrame::create(); ColorFrame* frame = ColorFrame::create();
GLubyte alpha = (GLubyte)DICTOOL->getIntValue_json(json, ALPHA);
GLubyte red = (GLubyte)DICTOOL->getIntValue_json(json, RED); GLubyte red = (GLubyte)DICTOOL->getIntValue_json(json, RED);
GLubyte green = (GLubyte)DICTOOL->getIntValue_json(json, GREEN); GLubyte green = (GLubyte)DICTOOL->getIntValue_json(json, GREEN);
GLubyte blue = (GLubyte)DICTOOL->getIntValue_json(json, BLUE); GLubyte blue = (GLubyte)DICTOOL->getIntValue_json(json, BLUE);
frame->setAlpha(alpha);
frame->setColor(Color3B(red, green, blue)); frame->setColor(Color3B(red, green, blue));
return frame; return frame;

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

@ -595,20 +595,16 @@ ColorFrame* ColorFrame::create()
} }
ColorFrame::ColorFrame() ColorFrame::ColorFrame()
: _alpha(255) : _color(Color3B(255, 255, 255))
, _color(Color3B(255, 255, 255))
{ {
} }
void ColorFrame::onEnter(Frame *nextFrame, int currentFrameIndex) void ColorFrame::onEnter(Frame *nextFrame, int currentFrameIndex)
{ {
_node->setOpacity(_alpha);
_node->setColor(_color); _node->setColor(_color);
if(_tween) if(_tween)
{ {
_betweenAlpha = static_cast<ColorFrame*>(nextFrame)->_alpha - _alpha;
const Color3B& color = static_cast<ColorFrame*>(nextFrame)->_color; const Color3B& color = static_cast<ColorFrame*>(nextFrame)->_color;
_betweenRed = color.r - _color.r; _betweenRed = color.r - _color.r;
_betweenGreen = color.g - _color.g; _betweenGreen = color.g - _color.g;
@ -618,16 +614,13 @@ void ColorFrame::onEnter(Frame *nextFrame, int currentFrameIndex)
void ColorFrame::apply(float percent) void ColorFrame::apply(float percent)
{ {
if (_tween && (_betweenAlpha !=0 || _betweenRed != 0 || _betweenGreen != 0 || _betweenBlue != 0)) if (_tween && (_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);
} }
} }
@ -635,7 +628,6 @@ void ColorFrame::apply(float percent)
Frame* ColorFrame::clone() Frame* ColorFrame::clone()
{ {
ColorFrame* frame = ColorFrame::create(); ColorFrame* frame = ColorFrame::create();
frame->setAlpha(_alpha);
frame->setColor(_color); frame->setColor(_color);
frame->cloneProperty(this); frame->cloneProperty(this);

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

@ -299,17 +299,12 @@ public:
virtual void apply(float percent) override; virtual void apply(float percent) override;
virtual Frame* clone() override; virtual Frame* clone() override;
inline void setAlpha(GLubyte alpha) { _alpha = alpha; }
inline GLubyte getAlpha() const { return _alpha; }
inline void setColor(const cocos2d::Color3B& color) { _color = color; } inline void setColor(const cocos2d::Color3B& color) { _color = color; }
inline cocos2d::Color3B getColor() const { return _color; } inline cocos2d::Color3B getColor() const { return _color; }
protected: protected:
GLubyte _alpha;
cocos2d::Color3B _color; cocos2d::Color3B _color;
int _betweenAlpha;
int _betweenRed; int _betweenRed;
int _betweenGreen; int _betweenGreen;
int _betweenBlue; int _betweenBlue;