From 8d24ea7efe5631cc590d8b8c7998acd4a0fbbf3a Mon Sep 17 00:00:00 2001 From: yangxiao Date: Thu, 26 Mar 2015 10:20:28 +0800 Subject: [PATCH] rename to nodeanimation --- .../cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp | 12 ++++++------ tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp index 474be33328..cfffde55a7 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp @@ -72,7 +72,7 @@ static std::function createFunctions[] = CL(Sprite3DEmptyTest), CL(UseCaseSprite3D), CL(Sprite3DForceDepthTest), - CL(NodeFrameAnimationTest) + CL(NodeAnimationTest) }; #define MAX_LAYER (sizeof(createFunctions) / sizeof(createFunctions[0])) @@ -2340,7 +2340,7 @@ void UseCaseSprite3D::update(float delta) ///////////////////////////////////////////// // Node Frame Animation -NodeFrameAnimationTest::NodeFrameAnimationTest() +NodeAnimationTest::NodeAnimationTest() :_vectorIndex(0) { auto s = Director::getInstance()->getWinSize(); @@ -2380,16 +2380,16 @@ NodeFrameAnimationTest::NodeFrameAnimationTest() addNewSpriteWithCoords(Vec2(s.width / 2.f, s.height / 2.f)); } -std::string NodeFrameAnimationTest::title() const +std::string NodeAnimationTest::title() const { - return "Node Frame Animation Test"; + return "Node Animation Test"; } -std::string NodeFrameAnimationTest::subtitle() const +std::string NodeAnimationTest::subtitle() const { return "Jumping animation"; } -void NodeFrameAnimationTest::addNewSpriteWithCoords(Vec2 p) +void NodeAnimationTest::addNewSpriteWithCoords(Vec2 p) { auto s = Director::getInstance()->getWinSize(); diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h index f2d38128e3..d0724bd5a6 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h @@ -491,12 +491,12 @@ protected: std::string _useCaseTitles[(int)USECASE::MAX_CASE_NUM]; }; -// node fame animation test -class NodeFrameAnimationTest : public Sprite3DTestDemo +// node animation test, cocos2d-x supports both skeletal animation and node animation +class NodeAnimationTest : public Sprite3DTestDemo { public: - CREATE_FUNC(NodeFrameAnimationTest); - NodeFrameAnimationTest(); + CREATE_FUNC(NodeAnimationTest); + NodeAnimationTest(); virtual std::string title() const override; virtual std::string subtitle() const override;