Skip to content

Add the ability to set global Z order of physics debug draw node #19885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 3, 2019
Merged

Add the ability to set global Z order of physics debug draw node #19885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30fb96e
Merge pull request #4 from cocos2d/v3
rh101 May 29, 2019
67d2f79
Added RenderTexture::saveToFileAsNonPMA() to save images without PMA.
rh101 May 30, 2019
b5bdada
[CCImage-ios.mm] Fixed indentation.
rh101 Jun 4, 2019
7065335
Merge pull request #5 from cocos2d/v3
rh101 Jun 16, 2019
94ec877
Merge pull request #7 from cocos2d/v3
rh101 Jun 22, 2019
92dd2e5
Merge pull request #8 from cocos2d/v3
rh101 Jun 30, 2019
bd26d28
Added the ability to set the global Z order of the debug node, since …
rh101 Jun 30, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cocos/physics/CCPhysicsWorld.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ void PhysicsWorld::debugDraw()
{
_debugDraw = DrawNode::create();
_debugDraw->setIsolated(true);
_debugDraw->setGlobalZOrder(_debugDrawGlobalZOrder);
_debugDraw->retain();
Director::getInstance()->getRunningScene()->addChild(_debugDraw);
}
Expand Down Expand Up @@ -990,6 +991,7 @@ PhysicsWorld::PhysicsWorld()
, _debugDraw(nullptr)
, _debugDrawMask(DEBUGDRAW_NONE)
, _eventDispatcher(nullptr)
, _debugDrawGlobalZOrder(0.f)
{

}
Expand Down
10 changes: 8 additions & 2 deletions cocos/physics/CCPhysicsWorld.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,12 @@ class CC_DLL PhysicsWorld
* @return An integer number.
*/
int getDebugDrawMask() { return _debugDrawMask; }


/**
* Set the debug draw global Z order.
*/
void setDebugDrawGlobalZOrder(float globalZOrder) { _debugDrawGlobalZOrder = globalZOrder; }

/**
* To control the step of physics.
*
Expand Down Expand Up @@ -396,7 +401,8 @@ class CC_DLL PhysicsWorld
bool _autoStep;
DrawNode* _debugDraw;
int _debugDrawMask;

float _debugDrawGlobalZOrder;

EventDispatcher* _eventDispatcher;

Vector<PhysicsBody*> _delayAddBodies;
Expand Down