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

adds mising tests + cosmetic changes

This commit is contained in:
Ricardo Quesada 2013-06-03 22:47:28 -07:00
parent cc771da2c2
commit dccc4a3814
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
samples/Cpp/TestCpp/Classes/controller.cpp
View File

@ -43,12 +43,14 @@ static std::vector< std::tuple<std::string, std::function<TestScene*()>>> g_aTes
{ "FileUtilsTest", []() { return new FileUtilsTestScene(); } }, { "FileUtilsTest", []() { return new FileUtilsTestScene(); } },
{ "FontTest", []() { return new FontTestScene(); } }, { "FontTest", []() { return new FontTestScene(); } },
{ "IntervalTest", [](){return new IntervalTestScene(); } }, { "IntervalTest", [](){return new IntervalTestScene(); } },
#if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA)
{ "KeypadTest", []() { return new KeypadTestScene(); } }, { "KeypadTest", []() { return new KeypadTestScene(); } },
#endif
{ "LabelTest", [](){return new AtlasTestScene(); } }, { "LabelTest", [](){return new AtlasTestScene(); } },
{ "LayerTest", [](){return new LayerTestScene();} }, { "LayerTest", [](){return new LayerTestScene();} },
{ "MenuTest", [](){return new MenuTestScene();} }, { "MenuTest", [](){return new MenuTestScene();} },
{ "MotionStreakTest", [](){return new MotionStreakTestScene();} }, { "MotionStreakTest", [](){return new MotionStreakTestScene();} },
// { "MutiTouchTest", []() { return CCScene::create(); } }, // XXX { "MutiTouchTest", []() { return new MutiTouchTestScene(); } },
{ "NodeTest", [](){return new CocosNodeTestScene();} }, { "NodeTest", [](){return new CocosNodeTestScene();} },
{ "ParallaxTest", [](){return new ParallaxTestScene(); } }, { "ParallaxTest", [](){return new ParallaxTestScene(); } },
{ "ParticleTest", [](){return new ParticleTestScene(); } }, { "ParticleTest", [](){return new ParticleTestScene(); } },
@ -62,8 +64,10 @@ static std::vector< std::tuple<std::string, std::function<TestScene*()>>> g_aTes
{ "SpriteTest", [](){return new SpriteTestScene(); } }, { "SpriteTest", [](){return new SpriteTestScene(); } },
{ "TextInputTest", [](){return new TextInputTestScene(); } }, { "TextInputTest", [](){return new TextInputTestScene(); } },
{ "Texture2DTest", [](){return new TextureTestScene(); } }, { "Texture2DTest", [](){return new TextureTestScene(); } },
#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
{ "TextureCacheTest", []() { return new TextureCacheTestScene(); } }, { "TextureCacheTest", []() { return new TextureCacheTestScene(); } },
// { "TexturePackerEncryption", []() { return CCScene::create(); } }, // XXX #endif
{ "TexturePackerEncryption", []() { return new TextureAtlasEncryptionTestScene(); } },
{ "TileMapTest", [](){return new TileMapTestScene(); } }, { "TileMapTest", [](){return new TileMapTestScene(); } },
{ "TouchesTest", [](){return new PongScene();} }, { "TouchesTest", [](){return new PongScene();} },
{ "TransitionsTest", [](){return new TransitionsTestScene();} }, { "TransitionsTest", [](){return new TransitionsTestScene();} },
@ -77,14 +81,6 @@ static int g_testCount = g_aTestNames.size();
static CCPoint s_tCurPos = CCPointZero; static CCPoint s_tCurPos = CCPointZero;
static TestScene* CreateTestScene(int i)
{
CCDirector::sharedDirector()->purgeCachedData();
std::function<TestScene*()> f = std::get<1>( g_aTestNames[i] );
return f();
}
TestController::TestController() TestController::TestController()
: m_tBeginPos(CCPointZero) : m_tBeginPos(CCPointZero)
{ {
@ -129,12 +125,17 @@ TestController::~TestController()
void TestController::menuCallback(CCObject * pSender) void TestController::menuCallback(CCObject * pSender)
{ {
CCDirector::sharedDirector()->purgeCachedData();
// get the userdata, it's the index of the menu item clicked // get the userdata, it's the index of the menu item clicked
CCMenuItem* pMenuItem = (CCMenuItem *)(pSender); CCMenuItem* pMenuItem = (CCMenuItem *)(pSender);
int nIdx = pMenuItem->getZOrder() - 10000; int idx = pMenuItem->getZOrder() - 10000;
// create the test scene and run it // create the test scene and run it
TestScene* pScene = CreateTestScene(nIdx); auto functor = std::get<1>( g_aTestNames[idx] );
TestScene* pScene = functor();
if (pScene) if (pScene)
{ {
pScene->runThisTest(); pScene->runThisTest();