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

fixed emit last frame several times

This commit is contained in:
kaile.yin 2014-10-17 20:43:01 +08:00
parent 871b440fc7
commit 5b0e2f0304
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ NS_TIMELINE_BEGIN
Frame::Frame() Frame::Frame()
: _frameIndex(0) : _frameIndex(0)
, _tween(true) , _tween(true)
, _enterWhenPassed(false)
, _timeline(nullptr) , _timeline(nullptr)
, _node(nullptr) , _node(nullptr)
{ {
@ -554,6 +555,7 @@ EventFrame* EventFrame::create()
EventFrame* frame = new (std::nothrow) EventFrame(); EventFrame* frame = new (std::nothrow) EventFrame();
if (frame) if (frame)
{ {
frame->init();
frame->autorelease(); frame->autorelease();
return frame; return frame;
} }
@ -561,6 +563,11 @@ EventFrame* EventFrame::create()
return nullptr; return nullptr;
} }
void EventFrame::init()
{
_enterWhenPassed = true;
}
EventFrame::EventFrame() EventFrame::EventFrame()
: _event("") : _event("")
{ {

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

@ -54,6 +54,8 @@ public:
virtual void setTween(bool tween) { _tween = tween; } virtual void setTween(bool tween) { _tween = tween; }
virtual bool isTween() const { return _tween; } virtual bool isTween() const { return _tween; }
virtual bool isEnterWhenPassed() { return _enterWhenPassed; }
virtual void onEnter(Frame *nextFrame) = 0; virtual void onEnter(Frame *nextFrame) = 0;
virtual void apply(float percent) {} virtual void apply(float percent) {}
@ -68,6 +70,7 @@ protected:
unsigned int _frameIndex; unsigned int _frameIndex;
bool _tween; bool _tween;
bool _enterWhenPassed;
Timeline* _timeline; Timeline* _timeline;
cocos2d::Node* _node; cocos2d::Node* _node;
@ -300,6 +303,7 @@ class CC_STUDIO_DLL EventFrame : public Frame
{ {
public: public:
static EventFrame* create(); static EventFrame* create();
void init();
EventFrame(); EventFrame();

23
cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp
View File

@ -210,10 +210,9 @@ void Timeline::updateCurrentKeyFrame(int frameIndex)
} }
else if(frameIndex >= _frames.at(length - 1)->getFrameIndex()) else if(frameIndex >= _frames.at(length - 1)->getFrameIndex())
{ {
from = to = _frames.at(length - 1); int lastFrameIndex = _frames.at(length - 1)->getFrameIndex();
_currentKeyFrameIndex = _frames.at(length - 1)->getFrameIndex(); if(_currentKeyFrameIndex >= lastFrameIndex)
_betweenDuration = 0; return;
break;
} }
do do
@ -229,14 +228,20 @@ void Timeline::updateCurrentKeyFrame(int frameIndex)
} }
to = _frames.at(_toIndex); to = _frames.at(_toIndex);
if(from->getFrameIndex() == 19)
if (frameIndex == from->getFrameIndex()) int a = 0;
{ if(frameIndex == from->getFrameIndex())
break; break;
} if(frameIndex > from->getFrameIndex() && frameIndex < to->getFrameIndex())
break;
if(from->isEnterWhenPassed())
from->onEnter(to);
} }
while (frameIndex < from->getFrameIndex() || frameIndex >= to->getFrameIndex()); while (true);
if(_fromIndex == length)
to = from;
_betweenDuration = to->getFrameIndex() - from->getFrameIndex(); _betweenDuration = to->getFrameIndex() - from->getFrameIndex();
} while (0); } while (0);