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

Fixed ClippingNode stencil needing global z set manually (#1831) 

This bug has existed since the Cocos2d-x 3.x days. If you set the global z order of a ClippingNode to anything other than the default value, then the ClippingNode fails to clip anything unless the global z order is also set for the Stencil of that ClippingNode. This change makes the ClippingNode._stencil's global z order to follow the ClippingNode's. (Note: you could still manually set the global z order of the stencil as desired to break the clipping. But now the default behavior works correctly and the way one would expect.)
This commit is contained in:
Tyelor D. Klein 2024-04-17 13:07:52 -07:00 committed by GitHub
parent 1cfe6fcb3f
commit 332eb9afd3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/2d/ClippingNode.cpp
View File

@ -227,6 +227,16 @@ void ClippingNode::visit(Renderer* renderer, const Mat4& parentTransform, uint32
_director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
}
void ClippingNode::setGlobalZOrder(float globalZOrder)
{
Node::setGlobalZOrder(globalZOrder);
if (_stencil) {
// Make sure our stencil stays on the same globalZOrder:
_stencil->setGlobalZOrder(globalZOrder);
}
}
void ClippingNode::setCameraMask(unsigned short mask, bool applyChildren)
{
Node::setCameraMask(mask, applyChildren);
@ -279,6 +289,9 @@ void ClippingNode::setStencil(Node* stencil)
if (_stencil != nullptr)
{
// Make sure our stencil stays on the same globalZOrder:
_stencil->setGlobalZOrder(getGlobalZOrder());
_originalStencilProgramState[_stencil] = _stencil->getProgramState();
auto& children = _stencil->getChildren();
for (const auto& child : children)

3
core/2d/ClippingNode.h
View File

@ -3,6 +3,7 @@
* Copyright (c) 2012 cocos2d-x.org
* Copyright (c) 2013-2016 Chukong Technologies Inc.
* Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
* Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
*
* https://axmolengine.github.io/
*
@ -133,6 +134,8 @@ public:
virtual void onExit() override;
virtual void visit(Renderer* renderer, const Mat4& parentTransform, uint32_t parentFlags) override;
virtual void setGlobalZOrder(float globalZOrder) override;
virtual void setCameraMask(unsigned short mask, bool applyChildren = true) override;
ClippingNode();