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

rename setAnimationEndCallFunc

This commit is contained in:
geron-cn 2015-09-20 16:24:41 +08:00
parent 0cfc33e4d3
commit f93cfac0f7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,7 +334,7 @@ const AnimationInfo& ActionTimeline::getAnimationInfo(const std::string &animati
return _animationInfos.find(animationName)->second;
}
void ActionTimeline::setAnimationEndCallBackFunc(const std::string animationName, std::function<void()> func)
void ActionTimeline::setAnimationEndCallFunc(const std::string animationName, std::function<void()> func)
{
auto clipIter = _animationInfos.find(animationName);
if (clipIter == _animationInfos.end())

2
cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h
View File

@ -160,7 +160,7 @@ public:
* @param animationName @addFrameEndCallFunc, make the animationName as funcKey
* @param func the callback function
*/
virtual void setAnimationEndCallBackFunc(const std::string animationName, std::function<void()> func);
virtual void setAnimationEndCallFunc(const std::string animationName, std::function<void()> func);
/** Set ActionTimeline's frame event callback function */
void setFrameEventCallFunc(std::function<void(Frame *)> listener);

2
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
View File

@ -644,7 +644,7 @@ void TestAnimationClipEndCallBack::onEnter()
});
// test for animation clip end call back
action->setAnimationEndCallBackFunc("stand", [this]{
action->setAnimationEndCallFunc("stand", [this]{
auto text = ui::Text::create();
text->setString("CallBackAfterStandAnimationClip");
text->setPosition(Vec2(100, 130));