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

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest

This commit is contained in:
samuele3hu 2013-09-18 17:25:35 +08:00
parent d4669f3ad4 d38dee32a0
commit 9b87bf4cb1
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/CocoStudio/Action/CCActionNode.cpp
View File

@ -362,6 +362,7 @@ void ActionNode::stopAction()
int ActionNode::getFirstFrameIndex()
{
int frameindex = 99999;
bool bFindFrame = false;
for (int n = 0; n < _frameArrayNum; n++)
{
Array* cArray = (Array*)(_frameArray->getObjectAtIndex(n));
@ -369,7 +370,7 @@ int ActionNode::getFirstFrameIndex()
{
continue;
}
bFindFrame = true;
ActionFrame* frame = (ActionFrame*)(cArray->getObjectAtIndex(0));
int iFrameIndex = frame->getFrameIndex();
@ -378,13 +379,17 @@ int ActionNode::getFirstFrameIndex()
frameindex = iFrameIndex;
}
}
if (!bFindFrame)
{
frameindex = 0;
}
return frameindex;
}
int ActionNode::getLastFrameIndex()
{
int frameindex = -1;
bool bFindFrame = false;
for (int n = 0; n < _frameArrayNum; n++)
{
Array* cArray = (Array*)(_frameArray->getObjectAtIndex(n));
@ -392,6 +397,7 @@ int ActionNode::getLastFrameIndex()
{
continue;
}
bFindFrame = true;
int lastInex = cArray->count() - 1;
ActionFrame* frame = (ActionFrame*)(cArray->getObjectAtIndex(lastInex));
int iFrameIndex = frame->getFrameIndex();
@ -401,7 +407,10 @@ int ActionNode::getLastFrameIndex()
frameindex = iFrameIndex;
}
}
if (!bFindFrame)
{
frameindex = 0;
}
return frameindex;
}
bool ActionNode::updateActionToTimeLine(float fTime)

1
extensions/CocoStudio/Action/CCActionObject.cpp
View File

@ -118,6 +118,7 @@ void ActionObject::addActionNode(ActionNode* node)
return;
}
_actionNodeList->addObject(node);
node->setUnitTime(_fUnitTime);
}
void ActionObject::removeActionNode(ActionNode* node)
{