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

Merge pull request #3687 from liamcindy/develop_action 

limited action frame index
This commit is contained in:
minggo 2013-09-18 02:10:26 -07:00
parent 5a65ef7488 3515a4f286
commit d38dee32a0
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 ActionNode::getFirstFrameIndex()
{ {
int frameindex = 99999; int frameindex = 99999;
bool bFindFrame = false;
for (int n = 0; n < _frameArrayNum; n++) for (int n = 0; n < _frameArrayNum; n++)
{ {
Array* cArray = (Array*)(_frameArray->getObjectAtIndex(n)); Array* cArray = (Array*)(_frameArray->getObjectAtIndex(n));
@ -369,7 +370,7 @@ int ActionNode::getFirstFrameIndex()
{ {
continue; continue;
} }
bFindFrame = true;
ActionFrame* frame = (ActionFrame*)(cArray->getObjectAtIndex(0)); ActionFrame* frame = (ActionFrame*)(cArray->getObjectAtIndex(0));
int iFrameIndex = frame->getFrameIndex(); int iFrameIndex = frame->getFrameIndex();
@ -378,13 +379,17 @@ int ActionNode::getFirstFrameIndex()
frameindex = iFrameIndex; frameindex = iFrameIndex;
} }
} }
if (!bFindFrame)
{
frameindex = 0;
}
return frameindex; return frameindex;
} }
int ActionNode::getLastFrameIndex() int ActionNode::getLastFrameIndex()
{ {
int frameindex = -1; int frameindex = -1;
bool bFindFrame = false;
for (int n = 0; n < _frameArrayNum; n++) for (int n = 0; n < _frameArrayNum; n++)
{ {
Array* cArray = (Array*)(_frameArray->getObjectAtIndex(n)); Array* cArray = (Array*)(_frameArray->getObjectAtIndex(n));
@ -392,6 +397,7 @@ int ActionNode::getLastFrameIndex()
{ {
continue; continue;
} }
bFindFrame = true;
int lastInex = cArray->count() - 1; int lastInex = cArray->count() - 1;
ActionFrame* frame = (ActionFrame*)(cArray->getObjectAtIndex(lastInex)); ActionFrame* frame = (ActionFrame*)(cArray->getObjectAtIndex(lastInex));
int iFrameIndex = frame->getFrameIndex(); int iFrameIndex = frame->getFrameIndex();
@ -401,7 +407,10 @@ int ActionNode::getLastFrameIndex()
frameindex = iFrameIndex; frameindex = iFrameIndex;
} }
} }
if (!bFindFrame)
{
frameindex = 0;
}
return frameindex; return frameindex;
} }
bool ActionNode::updateActionToTimeLine(float fTime) bool ActionNode::updateActionToTimeLine(float fTime)

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

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