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

Merge pull request #8853 from 2youyouo2/v3_EventFrame 

fixed emit frame event
This commit is contained in:
minggo 2014-10-20 13:57:38 +08:00
parent 2c3f22eb11 03ebe0152b
commit 49bd79d14a
3 changed files with 47 additions and 11 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()
: _frameIndex(0)
, _tween(true)
, _enterWhenPassed(false)
, _timeline(nullptr)
, _node(nullptr)
{
@ -554,6 +555,7 @@ EventFrame* EventFrame::create()
EventFrame* frame = new (std::nothrow) EventFrame();
if (frame)
{
frame->init();
frame->autorelease();
return frame;
}
@ -561,6 +563,11 @@ EventFrame* EventFrame::create()
return nullptr;
}
void EventFrame::init()
{
_enterWhenPassed = true;
}
EventFrame::EventFrame()
: _event("")
{

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

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

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

@ -144,6 +144,13 @@ void Timeline::binarySearchKeyFrame(int frameIndex)
if(_currentKeyFrameIndex >= _frames.at(0)->getFrameIndex())
needEnterFrame = true;
_fromIndex = 0;
if(length > 1)
_toIndex = 1;
else
_toIndex = 0;
from = to = _frames.at(0);
_currentKeyFrameIndex = 0;
_betweenDuration = _frames.at(0)->getFrameIndex();
@ -151,6 +158,9 @@ void Timeline::binarySearchKeyFrame(int frameIndex)
}
else if(frameIndex >= _frames.at(length - 1)->getFrameIndex())
{
_fromIndex = (int)(length - 1);
_toIndex = 0;
from = to = _frames.at(length - 1);
_currentKeyFrameIndex = _frames.at(length - 1)->getFrameIndex();
_betweenDuration = 0;
@ -172,8 +182,15 @@ void Timeline::binarySearchKeyFrame(int frameIndex)
low=mid+1;
}
from = _frames.at(target);
to = _frames.at(target+1);
_fromIndex = (int)target;
if(length > 1)
_toIndex = (int)(target + 1);
else
_toIndex = (int)target;
from = _frames.at(_fromIndex);
to = _frames.at(_toIndex);
if(target == 0 && _currentKeyFrameIndex<from->getFrameIndex())
needEnterFrame = true;
@ -191,6 +208,8 @@ void Timeline::binarySearchKeyFrame(int frameIndex)
void Timeline::updateCurrentKeyFrame(int frameIndex)
{
if(frameIndex > 60)
int a = 0;
//! If play to current frame's front or back, then find current frame again
if (frameIndex < _currentKeyFrameIndex || frameIndex >= _currentKeyFrameIndex + _betweenDuration)
{
@ -210,10 +229,10 @@ void Timeline::updateCurrentKeyFrame(int frameIndex)
}
else if(frameIndex >= _frames.at(length - 1)->getFrameIndex())
{
from = to = _frames.at(length - 1);
_currentKeyFrameIndex = _frames.at(length - 1)->getFrameIndex();
_betweenDuration = 0;
break;
int lastFrameIndex = _frames.at(length - 1)->getFrameIndex();
if(_currentKeyFrameIndex >= lastFrameIndex)
return;
frameIndex = lastFrameIndex;
}
do
@ -231,11 +250,16 @@ void Timeline::updateCurrentKeyFrame(int frameIndex)
to = _frames.at(_toIndex);
if(frameIndex == from->getFrameIndex())
{
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-1)
to = from;
_betweenDuration = to->getFrameIndex() - from->getFrameIndex();
@ -243,6 +267,7 @@ void Timeline::updateCurrentKeyFrame(int frameIndex)
_currentKeyFrame = from;
_currentKeyFrame->onEnter(to);
}
}