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

rename to nodeanimation

This commit is contained in:
yangxiao 2015-03-26 10:20:28 +08:00
parent 90e010aec8
commit 8d24ea7efe
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
View File

@ -72,7 +72,7 @@ static std::function<Layer*()> 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();

8
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
View File

@ -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;