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

Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3

This commit is contained in:
kaile.yin 2014-12-04 18:52:00 +08:00
parent 9f9c4782f1 2b7ead06de
commit b3da40c022
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
View File

@ -217,13 +217,8 @@ void TestChangePlaySection::onEnter()
{
ActionTimelineTestLayer::onEnter();
//ActionTimelineNode* node = CSLoader::createActionTimelineNode("ActionTimeline/DemoPlayer.csb", 41, 130, true);
//action = node->getActionTimeline();
Node* node = CSLoader::createNode("ActionTimeline/DemoPlayer.csb");
ActionTimeline* action = CSLoader::createTimeline("ActionTimeline/DemoPlayer.csb");
node->runAction(action);
action->gotoFrameAndPlay(41, action->getDuration(), true);
ActionTimelineNode* node = CSLoader::createActionTimelineNode("ActionTimeline/DemoPlayer.csb", 41, 81, true);
action = node->getActionTimeline();
node->setScale(0.2f);
node->setPosition(VisibleRect::center());
@ -245,9 +240,9 @@ std::string TestChangePlaySection::title() const
void TestChangePlaySection::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
{
if(action->getStartFrame() == 0)
action->gotoFrameAndPlay(70, action->getDuration(), true);
action->gotoFrameAndPlay(41, 81, true);
else
action->gotoFrameAndPlay(0, 60, true);
action->gotoFrameAndPlay(0, 40, true);
}
// TestFrameEvent
@ -255,9 +250,7 @@ void TestTimelineFrameEvent::onEnter()
{
ActionTimelineTestLayer::onEnter();
SpriteFrameCache::getInstance()->addSpriteFramesWithFile("armature/Cowboy0.plist", "armature/Cowboy0.png");
ActionTimelineNode* node = CSLoader::createActionTimelineNode("ActionTimeline/boy_1.csb", 0, 60, true);
ActionTimelineNode* node = CSLoader::createActionTimelineNode("ActionTimeline/DemoPlayer.csb", 0, 40, true);
ActionTimeline* action = node->getActionTimeline();
node->setScale(0.2f);
@ -298,12 +291,7 @@ void TestTimelinePerformance::onEnter()
for (int i = 0; i< 100; i++)
{
//ActionTimelineNode* node = CSLoader::createActionTimelineNode("ActionTimeline/boy_1.csb", 41, 130, true);
Node* node = CSLoader::createNode("ActionTimeline/DemoPlayer.csb");
ActionTimeline* action = CSLoader::createTimeline("ActionTimeline/DemoPlayer.csb");
node->runAction(action);
action->gotoFrameAndPlay(41, action->getDuration(), true);
ActionTimelineNode* node = CSLoader::createActionTimelineNode("ActionTimeline/DemoPlayer.csb", 41, 81, true);
node->setScale(0.1f);
node->setPosition(i*2,100);