From ede4651b5e5f2903d69c1845addfb41c4306bcab Mon Sep 17 00:00:00 2001 From: geron-cn Date: Thu, 20 Aug 2015 11:29:52 +0800 Subject: [PATCH] add blendfunc Frame test case --- .../ActionTimelineTestScene.cpp | 21 +++++++++++++++++- .../ActionTimelineTestScene.h | 7 ++++++ .../ActionTimeline/skeletonBlendFuncFrame.csb | Bin 0 -> 18252 bytes 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tests/cpp-tests/Resources/ActionTimeline/skeletonBlendFuncFrame.csb diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp index 501a7373dc..1acda7e00d 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp @@ -23,6 +23,7 @@ CocoStudioActionTimelineTests::CocoStudioActionTimelineTests() ADD_TEST_CASE(TestActionTimelineEase); ADD_TEST_CASE(TestActionTimelineSkeleton); ADD_TEST_CASE(TestTimelineExtensionData); + ADD_TEST_CASE(TestActionTimelineBlendFuncFrame); } CocoStudioActionTimelineTests::~CocoStudioActionTimelineTests() @@ -577,4 +578,22 @@ void TestTimelineExtensionData::onEnter() std::string TestTimelineExtensionData::title() const { return "Test Timeline extension data"; -} \ No newline at end of file +} + +// TestActionTimelineBlendFuncFrame +void TestActionTimelineBlendFuncFrame::onEnter() +{ + ActionTimelineBaseTest::onEnter(); + Node* node = CSLoader::createNode("ActionTimeline/skeletonBlendFuncFrame.csb"); + ActionTimeline* action = CSLoader::createTimeline("ActionTimeline/skeletonBlendFuncFrame.csb"); + node->runAction(action); + node->setScale(0.2f); + node->setPosition(VisibleRect::center()); + this->addChild(node); + action->gotoFrameAndPlay(0); +} + +std::string TestActionTimelineBlendFuncFrame::title() const +{ + return "Test ActionTimeline BlendFunc Frame"; +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h index 7b48a9d1e9..b14e50d6b8 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h @@ -139,4 +139,11 @@ public: virtual std::string title() const override; }; +class TestActionTimelineBlendFuncFrame : public ActionTimelineBaseTest +{ +public: + CREATE_FUNC(TestActionTimelineBlendFuncFrame); + virtual void onEnter() override; + virtual std::string title() const override; +}; #endif // __ANIMATION_SCENE_H__ diff --git a/tests/cpp-tests/Resources/ActionTimeline/skeletonBlendFuncFrame.csb b/tests/cpp-tests/Resources/ActionTimeline/skeletonBlendFuncFrame.csb new file mode 100644 index 0000000000000000000000000000000000000000..c0dabdc8bb0d4e1c67398a8f3428f8f8599f9e51 GIT binary patch literal 18252 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