asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #89820 from rburing/concave_collision_polygon_2d

Browse source 
Fix concave `CollisionPolygon2D` debug drawing and docs
This commit is contained in:
Rémi Verschelde 2024-03-26 13:45:31 +01:00
commit a0d464ae19
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/CollisionPolygon2D.xml
View file

@ -4,7 +4,7 @@
A node that provides a polygon shape to a [CollisionObject2D] parent. A node that provides a polygon shape to a [CollisionObject2D] parent.
</brief_description> </brief_description>
<description> <description>
A node that provides a thickened polygon shape (a prism) to a [CollisionObject2D] parent and allows to edit it. The polygon can be concave or convex. This can give a detection shape to an [Area2D] or turn [PhysicsBody2D] into a solid object. A node that provides a polygon shape to a [CollisionObject2D] parent and allows to edit it. The polygon can be concave or convex. This can give a detection shape to an [Area2D], turn [PhysicsBody2D] into a solid object, or give a hollow shape to a [StaticBody2D].
[b]Warning:[/b] A non-uniformly scaled [CollisionShape2D] will likely not behave as expected. Make sure to keep its scale the same on all axes and adjust its shape resource instead. [b]Warning:[/b] A non-uniformly scaled [CollisionShape2D] will likely not behave as expected. Make sure to keep its scale the same on all axes and adjust its shape resource instead.
</description> </description>
<tutorials> <tutorials>

17
scene/2d/physics/collision_polygon_2d.cpp
View file

@ -132,17 +132,16 @@ void CollisionPolygon2D::_notification(int p_what) {
} }
if (polygon.size() > 2) { if (polygon.size() > 2) {
#define DEBUG_DECOMPOSE #ifdef TOOLS_ENABLED
#if defined(TOOLS_ENABLED) && defined(DEBUG_DECOMPOSE) if (build_mode == BUILD_SOLIDS) {
Vector<Vector<Vector2>> decomp = _decompose_in_convex(); Vector<Vector<Vector2>> decomp = _decompose_in_convex();
Color c(0.4, 0.9, 0.1); Color c(0.4, 0.9, 0.1);
for (int i = 0; i < decomp.size(); i++) { for (int i = 0; i < decomp.size(); i++) {
c.set_hsv(Math::fmod(c.get_h() + 0.738, 1), c.get_s(), c.get_v(), 0.5); c.set_hsv(Math::fmod(c.get_h() + 0.738, 1), c.get_s(), c.get_v(), 0.5);
draw_colored_polygon(decomp[i], c); draw_colored_polygon(decomp[i], c);
}
} }
#else
draw_colored_polygon(polygon, get_tree()->get_debug_collisions_color());
#endif #endif
const Color stroke_color = Color(0.9, 0.2, 0.0); const Color stroke_color = Color(0.9, 0.2, 0.0);