godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46291 from Calinou/debug-collision-shapes-draw-outline-3.2

Browse Source 
Draw an outline for 2D debug collision shapes
This commit is contained in:
Rémi Verschelde 2021-02-21 19:50:10 +01:00 committed by GitHub
commit bc2d9604b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/main/scene_tree.cpp
View File

@ -2032,7 +2032,7 @@ SceneTree::SceneTree() {
debug_collisions_hint = false; debug_collisions_hint = false;
debug_navigation_hint = false; debug_navigation_hint = false;
#endif #endif
debug_collisions_color = GLOBAL_DEF("debug/shapes/collision/shape_color", Color(0.0, 0.6, 0.7, 0.5)); debug_collisions_color = GLOBAL_DEF("debug/shapes/collision/shape_color", Color(0.0, 0.6, 0.7, 0.42));
debug_collision_contact_color = GLOBAL_DEF("debug/shapes/collision/contact_color", Color(1.0, 0.2, 0.1, 0.8)); debug_collision_contact_color = GLOBAL_DEF("debug/shapes/collision/contact_color", Color(1.0, 0.2, 0.1, 0.8));
debug_navigation_color = GLOBAL_DEF("debug/shapes/navigation/geometry_color", Color(0.1, 1.0, 0.7, 0.4)); debug_navigation_color = GLOBAL_DEF("debug/shapes/navigation/geometry_color", Color(0.1, 1.0, 0.7, 0.4));
debug_navigation_disabled_color = GLOBAL_DEF("debug/shapes/navigation/disabled_geometry_color", Color(1.0, 0.7, 0.1, 0.4)); debug_navigation_disabled_color = GLOBAL_DEF("debug/shapes/navigation/disabled_geometry_color", Color(1.0, 0.7, 0.1, 0.4));

3
scene/resources/capsule_shape_2d.cpp
View File

@ -89,6 +89,9 @@ void CapsuleShape2D::draw(const RID &p_to_rid, const Color &p_color) {
Vector<Color> col; Vector<Color> col;
col.push_back(p_color); col.push_back(p_color);
VisualServer::get_singleton()->canvas_item_add_polygon(p_to_rid, points, col); VisualServer::get_singleton()->canvas_item_add_polygon(p_to_rid, points, col);
VisualServer::get_singleton()->canvas_item_add_polyline(p_to_rid, points, col, 1.0, true);
// Draw the last segment as it's not drawn by `canvas_item_add_polyline()`.
VisualServer::get_singleton()->canvas_item_add_line(p_to_rid, points[points.size() - 1], points[0], p_color, 1.0, true);
} }
Rect2 CapsuleShape2D::get_rect() const { Rect2 CapsuleShape2D::get_rect() const {

3
scene/resources/circle_shape_2d.cpp
View File

@ -81,6 +81,9 @@ void CircleShape2D::draw(const RID &p_to_rid, const Color &p_color) {
Vector<Color> col; Vector<Color> col;
col.push_back(p_color); col.push_back(p_color);
VisualServer::get_singleton()->canvas_item_add_polygon(p_to_rid, points, col); VisualServer::get_singleton()->canvas_item_add_polygon(p_to_rid, points, col);
VisualServer::get_singleton()->canvas_item_add_polyline(p_to_rid, points, col, 1.0, true);
// Draw the last segment as it's not drawn by `canvas_item_add_polyline()`.
VisualServer::get_singleton()->canvas_item_add_line(p_to_rid, points[points.size() - 1], points[0], p_color, 1.0, true);
} }
CircleShape2D::CircleShape2D() : CircleShape2D::CircleShape2D() :

3
scene/resources/convex_polygon_shape_2d.cpp
View File

@ -82,6 +82,9 @@ void ConvexPolygonShape2D::draw(const RID &p_to_rid, const Color &p_color) {
Vector<Color> col; Vector<Color> col;
col.push_back(p_color); col.push_back(p_color);
VisualServer::get_singleton()->canvas_item_add_polygon(p_to_rid, points, col); VisualServer::get_singleton()->canvas_item_add_polygon(p_to_rid, points, col);
VisualServer::get_singleton()->canvas_item_add_polyline(p_to_rid, points, col, 1.0, true);
// Draw the last segment as it's not drawn by `canvas_item_add_polyline()`.
VisualServer::get_singleton()->canvas_item_add_line(p_to_rid, points[points.size() - 1], points[0], p_color, 1.0, true);
} }
Rect2 ConvexPolygonShape2D::get_rect() const { Rect2 ConvexPolygonShape2D::get_rect() const {

16
scene/resources/rectangle_shape_2d.cpp
View File

@ -51,7 +51,23 @@ Vector2 RectangleShape2D::get_extents() const {
void RectangleShape2D::draw(const RID &p_to_rid, const Color &p_color) { void RectangleShape2D::draw(const RID &p_to_rid, const Color &p_color) {
// Draw an outlined rectangle to make individual shapes easier to distinguish.
Vector<Vector2> stroke_points;
stroke_points.resize(5);
stroke_points.write[0] = -extents;
stroke_points.write[1] = Vector2(extents.x, -extents.y);
stroke_points.write[2] = extents;
stroke_points.write[3] = Vector2(-extents.x, extents.y);
stroke_points.write[4] = -extents;
Vector<Color> stroke_colors;
stroke_colors.resize(5);
for (int i = 0; i < 5; i++) {
stroke_colors.write[i] = p_color;
}
VisualServer::get_singleton()->canvas_item_add_rect(p_to_rid, Rect2(-extents, extents * 2.0), p_color); VisualServer::get_singleton()->canvas_item_add_rect(p_to_rid, Rect2(-extents, extents * 2.0), p_color);
VisualServer::get_singleton()->canvas_item_add_polyline(p_to_rid, stroke_points, stroke_colors, 1.0, true);
} }
Rect2 RectangleShape2D::get_rect() const { Rect2 RectangleShape2D::get_rect() const {