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

Merge pull request #4811 from ricardoquesada/transition_test_fix 

Improves transitions test
This commit is contained in:
Ricardo Quesada 2014-01-02 14:26:14 -08:00
parent 0fe73f3a5d f023ada6f6
commit de2569d726
1 changed files with 62 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
samples/Cpp/TestCpp/Classes/TransitionsTest/TransitionsTest.cpp
View File

@ -142,127 +142,83 @@ public:
} }
}; };
#define MAX_LAYER 41 #define STRINGIFY(x) #x
static std::string transitions[MAX_LAYER] = { #define TRANS(__className__) { \
"CCTransitionJumpZoom", { [](float t, Scene* s){ return __className__::create(t,s);} }, \
STRINGIFY(__className__), \
}
"CCTransitionProgressRadialCCW", struct _transitions {
"CCTransitionProgressRadialCW", std::function<TransitionScene*(float t, Scene* s)> function;
"CCTransitionProgressHorizontal", const char * name;
"CCTransitionProgressVertical", } transitions[] {
"CCTransitionProgressInOut", TRANS(TransitionJumpZoom),
"CCTransitionProgressOutIn", TRANS(TransitionProgressRadialCCW),
TRANS(TransitionProgressRadialCW),
TRANS(TransitionProgressHorizontal),
TRANS(TransitionProgressVertical),
TRANS(TransitionProgressInOut),
TRANS(TransitionProgressOutIn),
"CCTransitionCrossFade", TRANS(TransitionCrossFade),
"TransitionPageForward",
"TransitionPageBackward",
"CCTransitionFadeTR",
"CCTransitionFadeBL",
"CCTransitionFadeUp",
"CCTransitionFadeDown",
"CCTransitionTurnOffTiles",
"CCTransitionSplitRows",
"CCTransitionSplitCols",
"CCTransitionFade", TRANS(PageTransitionForward),
"FadeWhiteTransition", TRANS(PageTransitionBackward),
TRANS(TransitionFadeTR),
TRANS(TransitionFadeBL),
TRANS(TransitionFadeUp),
TRANS(TransitionFadeDown),
"FlipXLeftOver", TRANS(TransitionTurnOffTiles),
"FlipXRightOver",
"FlipYUpOver",
"FlipYDownOver",
"FlipAngularLeftOver",
"FlipAngularRightOver",
"ZoomFlipXLeftOver", TRANS(TransitionSplitRows),
"ZoomFlipXRightOver", TRANS(TransitionSplitCols),
"ZoomFlipYUpOver",
"ZoomFlipYDownOver",
"ZoomFlipAngularLeftOver",
"ZoomFlipAngularRightOver",
"CCTransitionShrinkGrow", TRANS(TransitionFade),
"CCTransitionRotoZoom", TRANS(FadeWhiteTransition),
"CCTransitionMoveInL", TRANS(FlipXLeftOver),
"CCTransitionMoveInR", TRANS(FlipXRightOver),
"CCTransitionMoveInT", TRANS(FlipYUpOver),
"CCTransitionMoveInB", TRANS(FlipYDownOver),
"CCTransitionSlideInL", TRANS(FlipAngularLeftOver),
"CCTransitionSlideInR", TRANS(FlipAngularRightOver),
"CCTransitionSlideInT",
"CCTransitionSlideInB",
TRANS(ZoomFlipXLeftOver),
TRANS(ZoomFlipXRightOver),
TRANS(ZoomFlipYUpOver),
TRANS(ZoomFlipYDownOver),
TRANS(ZoomFlipAngularLeftOver),
TRANS(ZoomFlipAngularRightOver),
TRANS(TransitionShrinkGrow),
TRANS(TransitionRotoZoom),
TRANS(TransitionMoveInL),
TRANS(TransitionMoveInR),
TRANS(TransitionMoveInT),
TRANS(TransitionMoveInB),
TRANS(TransitionSlideInL),
TRANS(TransitionSlideInR),
TRANS(TransitionSlideInT),
TRANS(TransitionSlideInB),
}; };
#define MAX_LAYER (sizeof(transitions) / sizeof(transitions[0]))
static int s_nSceneIdx = 0; static int s_nSceneIdx = 0;
TransitionScene* createTransition(int nIndex, float t, Scene* s) TransitionScene* createTransition(int index, float t, Scene* s)
{ {
// fix bug #486, without setDepthTest(false), FlipX,Y will flickers // fix bug #486, without setDepthTest(false), FlipX,Y will flickers
Director::getInstance()->setDepthTest(false); Director::getInstance()->setDepthTest(false);
switch(nIndex) return transitions[index].function(t,s);
{ }
case 0: return TransitionJumpZoom::create(t, s);
case 1: return TransitionProgressRadialCCW::create(t, s);
case 2: return TransitionProgressRadialCW::create(t, s);
case 3: return TransitionProgressHorizontal::create(t, s);
case 4: return TransitionProgressVertical::create(t, s);
case 5: return TransitionProgressInOut::create(t, s);
case 6: return TransitionProgressOutIn::create(t, s);
case 7: return TransitionCrossFade::create(t,s);
case 8: return PageTransitionForward::create(t, s);
case 9: return PageTransitionBackward::create(t, s);
case 10: return TransitionFadeTR::create(t, s);
case 11: return TransitionFadeBL::create(t, s);
case 12: return TransitionFadeUp::create(t, s);
case 13: return TransitionFadeDown::create(t, s);
case 14: return TransitionTurnOffTiles::create(t, s);
case 15: return TransitionSplitRows::create(t, s);
case 16: return TransitionSplitCols::create(t, s);
case 17: return TransitionFade::create(t, s);
case 18: return FadeWhiteTransition::create(t, s);
case 19: return FlipXLeftOver::create(t, s);
case 20: return FlipXRightOver::create(t, s);
case 21: return FlipYUpOver::create(t, s);
case 22: return FlipYDownOver::create(t, s);
case 23: return FlipAngularLeftOver::create(t, s);
case 24: return FlipAngularRightOver::create(t, s);
case 25: return ZoomFlipXLeftOver::create(t, s);
case 26: return ZoomFlipXRightOver::create(t, s);
case 27: return ZoomFlipYUpOver::create(t, s);
case 28: return ZoomFlipYDownOver::create(t, s);
case 29: return ZoomFlipAngularLeftOver::create(t, s);
case 30: return ZoomFlipAngularRightOver::create(t, s);
case 31: return TransitionShrinkGrow::create(t, s);
case 32: return TransitionRotoZoom::create(t, s);
case 33: return TransitionMoveInL::create(t, s);
case 34: return TransitionMoveInR::create(t, s);
case 35: return TransitionMoveInT::create(t, s);
case 36: return TransitionMoveInB::create(t, s);
case 37: return TransitionSlideInL::create(t, s);
case 38: return TransitionSlideInR::create(t, s);
case 39: return TransitionSlideInT::create(t, s);
case 40: return TransitionSlideInB::create(t, s);
default: break;
}
return NULL;
}
void TransitionsTestScene::runThisTest() void TransitionsTestScene::runThisTest()
@ -286,7 +242,7 @@ TestLayer1::TestLayer1(void)
bg1->setPosition( Point(size.width/2, size.height/2) ); bg1->setPosition( Point(size.width/2, size.height/2) );
addChild(bg1, -1); addChild(bg1, -1);
auto title = LabelTTF::create( (transitions[s_nSceneIdx]).c_str(), "Thonburi", 32 ); auto title = LabelTTF::create( (transitions[s_nSceneIdx]).name, "Thonburi", 32 );
addChild(title); addChild(title);
title->setColor( Color3B(255,32,32) ); title->setColor( Color3B(255,32,32) );
title->setPosition( Point(x/2, y-100) ); title->setPosition( Point(x/2, y-100) );
@ -415,7 +371,7 @@ TestLayer2::TestLayer2()
bg1->setPosition( Point(size.width/2, size.height/2) ); bg1->setPosition( Point(size.width/2, size.height/2) );
addChild(bg1, -1); addChild(bg1, -1);
auto title = LabelTTF::create((transitions[s_nSceneIdx]).c_str(), "Thonburi", 32 ); auto title = LabelTTF::create((transitions[s_nSceneIdx]).name, "Thonburi", 32 );
addChild(title); addChild(title);
title->setColor( Color3B(255,32,32) ); title->setColor( Color3B(255,32,32) );
title->setPosition( Point(x/2, y-100) ); title->setPosition( Point(x/2, y-100) );