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

issue #64 

add Transitions Test
This commit is contained in:
natural-law 2010-08-20 09:51:45 +00:00
parent cad3d3c230
commit 40e7abcc5f
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/layers_scenes_transitions_nodes/CCTransition.cpp
View File

@ -1053,7 +1053,7 @@ void CCFadeTransition :: onEnter()
__super::onEnter(); __super::onEnter();
CCColorLayer* l = CCColorLayer::layerWithColor(m_tColor); CCColorLayer* l = CCColorLayer::layerWithColor(m_tColor);
m_pOutScene->setIsVisible(false); m_pInScene->setIsVisible(false);
addChild(l, 2, kSceneFade); addChild(l, 2, kSceneFade);
CCNode* f = getChildByTag(kSceneFade); CCNode* f = getChildByTag(kSceneFade);

18
test_uphone/tests/TransitionsTest/TransitionsTest.cpp
View File

@ -223,12 +223,12 @@ CCTransitionScene* createTransition(int nIndex, ccTime t, CCScene* s)
case 18: return FlipYDownOver::transitionWithDuration(t, s); case 18: return FlipYDownOver::transitionWithDuration(t, s);
case 19: return FlipAngularLeftOver::transitionWithDuration(t, s); case 19: return FlipAngularLeftOver::transitionWithDuration(t, s);
case 20: return FlipAngularRightOver::transitionWithDuration(t, s); case 20: return FlipAngularRightOver::transitionWithDuration(t, s);
case 21: return ZoomFlipXLeftOver::transitionWithDuration(t, s); // case 21: return ZoomFlipXLeftOver::transitionWithDuration(t, s);
case 22: return ZoomFlipXRightOver::transitionWithDuration(t, s); // case 22: return ZoomFlipXRightOver::transitionWithDuration(t, s);
case 23: return ZoomFlipYUpOver::transitionWithDuration(t, s); // case 23: return ZoomFlipYUpOver::transitionWithDuration(t, s);
case 24: return ZoomFlipYDownOver::transitionWithDuration(t, s); // case 24: return ZoomFlipYDownOver::transitionWithDuration(t, s);
case 25: return ZoomFlipAngularLeftOver::transitionWithDuration(t, s); // case 25: return ZoomFlipAngularLeftOver::transitionWithDuration(t, s);
// case 26: return ZoomFlipAngularRightOver::transitionWithDuration(t, s); case 26: return ZoomFlipAngularRightOver::transitionWithDuration(t, s);
case 27: return CCShrinkGrowTransition::transitionWithDuration(t, s); case 27: return CCShrinkGrowTransition::transitionWithDuration(t, s);
case 28: return CCRotoZoomTransition::transitionWithDuration(t, s); case 28: return CCRotoZoomTransition::transitionWithDuration(t, s);
case 29: return CCMoveInLTransition::transitionWithDuration(t, s); case 29: return CCMoveInLTransition::transitionWithDuration(t, s);
@ -419,7 +419,7 @@ TestLayer2::~TestLayer2()
void TestLayer2::restartCallback(NSObject* pSender) void TestLayer2::restartCallback(NSObject* pSender)
{ {
CCScene* s = CCScene::node(); CCScene* s = new TransitionsTestScene();
CCLayer* pLayer = new TestLayer1(); CCLayer* pLayer = new TestLayer1();
s->addChild(pLayer); s->addChild(pLayer);
@ -433,7 +433,7 @@ void TestLayer2::restartCallback(NSObject* pSender)
void TestLayer2::nextCallback(NSObject* pSender) void TestLayer2::nextCallback(NSObject* pSender)
{ {
CCScene* s = CCScene::node(); CCScene* s = new TransitionsTestScene();
CCLayer* pLayer = new TestLayer1(); CCLayer* pLayer = new TestLayer1();
s->addChild(pLayer); s->addChild(pLayer);
@ -447,7 +447,7 @@ void TestLayer2::nextCallback(NSObject* pSender)
void TestLayer2::backCallback(NSObject* pSender) void TestLayer2::backCallback(NSObject* pSender)
{ {
CCScene* s = CCScene::node(); CCScene* s = new TransitionsTestScene();
CCLayer* pLayer = new TestLayer1(); CCLayer* pLayer = new TestLayer1();
s->addChild(pLayer); s->addChild(pLayer);

1
test_uphone/tests/testBasic.cpp
View File

@ -30,6 +30,7 @@ void BackToMainMenuLayer::MainMenuCallback(NSObject* pSender)
TestScene::TestScene() TestScene::TestScene()
{ {
__super::init();
CCLayer* pLayer = new BackToMainMenuLayer(); CCLayer* pLayer = new BackToMainMenuLayer();
pLayer->autorelease(); pLayer->autorelease();