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

Merge pull request #4635 from dabingnn/develop_FixClippingNodeBug 

fix clippingNode bug
This commit is contained in:
James Chen 2013-12-24 01:50:51 -08:00
parent 9976b94e59 b6dc3d0371
commit f664a72d6e
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cocos/2d/CCClippingNode.cpp
View File

@ -200,6 +200,11 @@ void ClippingNode::drawFullScreenQuadClearStencil()
void ClippingNode::visit()
{
if(!_visible)
return;
kmGLPushMatrix();
transform();
//Add group command
Renderer* renderer = Director::getInstance()->getRenderer();
@ -222,7 +227,31 @@ void ClippingNode::visit()
afterDrawStencilCmd->func = CC_CALLBACK_0(ClippingNode::onAfterDrawStencil, this);
renderer->addCommand(afterDrawStencilCmd);
Node::visit();
int i = 0;
if(!_children.empty())
{
sortAllChildren();
// draw children zOrder < 0
for( ; i < _children.size(); i++ )
{
auto node = _children.at(i);
if ( node && node->getZOrder() < 0 )
node->visit();
else
break;
}
// self draw
this->draw();
for(auto it=_children.cbegin()+i; it != _children.cend(); ++it)
(*it)->visit();
}
else
{
this->draw();
}
CustomCommand* afterVisitCmd = CustomCommand::getCommandPool().generateCommand();
afterVisitCmd->init(0,_vertexZ);
@ -230,6 +259,8 @@ void ClippingNode::visit()
renderer->addCommand(afterVisitCmd);
renderer->popGroup();
kmGLPopMatrix();
}
Node* ClippingNode::getStencil() const