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

Merge pull request #73208 from smix8/fix_navigationregion2d_debug_4.x

Browse Source 
Fix 2D navigation debug visuals ignoring half the ProjectSettings
This commit is contained in:
Rémi Verschelde 2023-02-13 12:58:09 +01:00
commit c144919a74
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 137 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
scene/2d/navigation_region_2d.cpp
View File

@ -167,58 +167,78 @@ void NavigationRegion2D::_notification(int p_what) {
case NOTIFICATION_DRAW: { case NOTIFICATION_DRAW: {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (is_inside_tree() && (Engine::get_singleton()->is_editor_hint() || NavigationServer3D::get_singleton()->get_debug_enabled()) && navigation_polygon.is_valid()) { if (is_inside_tree() && (Engine::get_singleton()->is_editor_hint() || NavigationServer2D::get_singleton()->get_debug_enabled()) && navigation_polygon.is_valid()) {
Vector<Vector2> verts = navigation_polygon->get_vertices(); Vector<Vector2> navigation_polygon_vertices = navigation_polygon->get_vertices();
if (verts.size() < 3) { if (navigation_polygon_vertices.size() < 3) {
return; return;
} }
Color color; const NavigationServer2D *ns2d = NavigationServer2D::get_singleton();
if (enabled) {
color = NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_color(); bool enabled_geometry_face_random_color = ns2d->get_debug_navigation_enable_geometry_face_random_color();
} else { bool enabled_edge_lines = ns2d->get_debug_navigation_enable_edge_lines();
color = NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_disabled_color(); bool enable_edge_connections = ns2d->get_debug_navigation_enable_edge_connections();
Color debug_face_color = ns2d->get_debug_navigation_geometry_face_color();
Color debug_edge_color = ns2d->get_debug_navigation_geometry_edge_color();
Color debug_edge_connection_color = ns2d->get_debug_navigation_edge_connection_color();
if (!enabled) {
debug_face_color = ns2d->get_debug_navigation_geometry_face_disabled_color();
debug_edge_color = ns2d->get_debug_navigation_geometry_edge_disabled_color();
} }
Color doors_color = NavigationServer3D::get_singleton()->get_debug_navigation_edge_connection_color();
RandomPCG rand; RandomPCG rand;
for (int i = 0; i < navigation_polygon->get_polygon_count(); i++) { for (int i = 0; i < navigation_polygon->get_polygon_count(); i++) {
// An array of vertices for this polygon. // An array of vertices for this polygon.
Vector<int> polygon = navigation_polygon->get_polygon(i); Vector<int> polygon = navigation_polygon->get_polygon(i);
Vector<Vector2> vertices; Vector<Vector2> debug_polygon_vertices;
vertices.resize(polygon.size()); debug_polygon_vertices.resize(polygon.size());
for (int j = 0; j < polygon.size(); j++) { for (int j = 0; j < polygon.size(); j++) {
ERR_FAIL_INDEX(polygon[j], verts.size()); ERR_FAIL_INDEX(polygon[j], navigation_polygon_vertices.size());
vertices.write[j] = verts[polygon[j]]; debug_polygon_vertices.write[j] = navigation_polygon_vertices[polygon[j]];
} }
// Generate the polygon color, slightly randomly modified from the settings one. // Generate the polygon color, slightly randomly modified from the settings one.
Color random_variation_color; Color random_variation_color = debug_face_color;
random_variation_color.set_hsv(color.get_h() + rand.random(-1.0, 1.0) * 0.1, color.get_s(), color.get_v() + rand.random(-1.0, 1.0) * 0.2); if (enabled_geometry_face_random_color) {
random_variation_color.a = color.a; random_variation_color.set_hsv(
Vector<Color> colors; debug_face_color.get_h() + rand.random(-1.0, 1.0) * 0.1,
colors.push_back(random_variation_color); debug_face_color.get_s(),
debug_face_color.get_v() + rand.random(-1.0, 1.0) * 0.2);
}
random_variation_color.a = debug_face_color.a;
RS::get_singleton()->canvas_item_add_polygon(get_canvas_item(), vertices, colors); Vector<Color> debug_face_colors;
debug_face_colors.push_back(random_variation_color);
RS::get_singleton()->canvas_item_add_polygon(get_canvas_item(), debug_polygon_vertices, debug_face_colors);
if (enabled_edge_lines) {
Vector<Color> debug_edge_colors;
debug_edge_colors.push_back(debug_edge_color);
debug_polygon_vertices.push_back(debug_polygon_vertices[0]); // Add first again for closing polyline.
RS::get_singleton()->canvas_item_add_polyline(get_canvas_item(), debug_polygon_vertices, debug_edge_colors);
}
} }
// Draw the region if (enable_edge_connections) {
Transform2D xform = get_global_transform(); // Draw the region edge connections.
const NavigationServer2D *ns = NavigationServer2D::get_singleton(); Transform2D xform = get_global_transform();
real_t radius = ns->map_get_edge_connection_margin(get_world_2d()->get_navigation_map()) / 2.0; real_t radius = ns2d->map_get_edge_connection_margin(get_world_2d()->get_navigation_map()) / 2.0;
for (int i = 0; i < ns->region_get_connections_count(region); i++) { for (int i = 0; i < ns2d->region_get_connections_count(region); i++) {
// Two main points // Two main points
Vector2 a = ns->region_get_connection_pathway_start(region, i); Vector2 a = ns2d->region_get_connection_pathway_start(region, i);
a = xform.affine_inverse().xform(a); a = xform.affine_inverse().xform(a);
Vector2 b = ns->region_get_connection_pathway_end(region, i); Vector2 b = ns2d->region_get_connection_pathway_end(region, i);
b = xform.affine_inverse().xform(b); b = xform.affine_inverse().xform(b);
draw_line(a, b, doors_color); draw_line(a, b, debug_edge_connection_color);
// Draw a circle to illustrate the margins. // Draw a circle to illustrate the margins.
real_t angle = a.angle_to_point(b); real_t angle = a.angle_to_point(b);
draw_arc(a, radius, angle + Math_PI / 2.0, angle - Math_PI / 2.0 + Math_TAU, 10, doors_color); draw_arc(a, radius, angle + Math_PI / 2.0, angle - Math_PI / 2.0 + Math_TAU, 10, debug_edge_connection_color);
draw_arc(b, radius, angle - Math_PI / 2.0, angle + Math_PI / 2.0, 10, doors_color); draw_arc(b, radius, angle - Math_PI / 2.0, angle + Math_PI / 2.0, 10, debug_edge_connection_color);
}
} }
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED

58
scene/2d/tile_map.cpp
View File

@ -1795,12 +1795,16 @@ void TileMap::_navigation_draw_quadrant_debug(TileMapQuadrant *p_quadrant) {
return; return;
} }
RenderingServer *rs = RenderingServer::get_singleton();
Color color = Color(0.5, 1.0, 1.0, 1.0);
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
color = NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_color(); RenderingServer *rs = RenderingServer::get_singleton();
#endif // DEBUG_ENABLED const NavigationServer2D *ns2d = NavigationServer2D::get_singleton();
bool enabled_geometry_face_random_color = ns2d->get_debug_navigation_enable_geometry_face_random_color();
bool enabled_edge_lines = ns2d->get_debug_navigation_enable_edge_lines();
Color debug_face_color = ns2d->get_debug_navigation_geometry_face_color();
Color debug_edge_color = ns2d->get_debug_navigation_geometry_edge_color();
RandomPCG rand; RandomPCG rand;
Vector2 quadrant_pos = map_to_local(p_quadrant->coords * get_effective_quadrant_size(p_quadrant->layer)); Vector2 quadrant_pos = map_to_local(p_quadrant->coords * get_effective_quadrant_size(p_quadrant->layer));
@ -1830,34 +1834,50 @@ void TileMap::_navigation_draw_quadrant_debug(TileMapQuadrant *p_quadrant) {
rs->canvas_item_add_set_transform(p_quadrant->debug_canvas_item, cell_to_quadrant); rs->canvas_item_add_set_transform(p_quadrant->debug_canvas_item, cell_to_quadrant);
for (int layer_index = 0; layer_index < tile_set->get_navigation_layers_count(); layer_index++) { for (int layer_index = 0; layer_index < tile_set->get_navigation_layers_count(); layer_index++) {
Ref<NavigationPolygon> navpoly = tile_data->get_navigation_polygon(layer_index); Ref<NavigationPolygon> navigation_polygon = tile_data->get_navigation_polygon(layer_index);
if (navpoly.is_valid()) { if (navigation_polygon.is_valid()) {
PackedVector2Array navigation_polygon_vertices = navpoly->get_vertices(); Vector<Vector2> navigation_polygon_vertices = navigation_polygon->get_vertices();
if (navigation_polygon_vertices.size() < 3) {
continue;
}
for (int i = 0; i < navpoly->get_polygon_count(); i++) { for (int i = 0; i < navigation_polygon->get_polygon_count(); i++) {
// An array of vertices for this polygon. // An array of vertices for this polygon.
Vector<int> polygon = navpoly->get_polygon(i); Vector<int> polygon = navigation_polygon->get_polygon(i);
Vector<Vector2> vertices; Vector<Vector2> debug_polygon_vertices;
vertices.resize(polygon.size()); debug_polygon_vertices.resize(polygon.size());
for (int j = 0; j < polygon.size(); j++) { for (int j = 0; j < polygon.size(); j++) {
ERR_FAIL_INDEX(polygon[j], navigation_polygon_vertices.size()); ERR_FAIL_INDEX(polygon[j], navigation_polygon_vertices.size());
vertices.write[j] = navigation_polygon_vertices[polygon[j]]; debug_polygon_vertices.write[j] = navigation_polygon_vertices[polygon[j]];
} }
// Generate the polygon color, slightly randomly modified from the settings one. // Generate the polygon color, slightly randomly modified from the settings one.
Color random_variation_color; Color random_variation_color = debug_face_color;
random_variation_color.set_hsv(color.get_h() + rand.random(-1.0, 1.0) * 0.05, color.get_s(), color.get_v() + rand.random(-1.0, 1.0) * 0.1); if (enabled_geometry_face_random_color) {
random_variation_color.a = color.a; random_variation_color.set_hsv(
Vector<Color> colors; debug_face_color.get_h() + rand.random(-1.0, 1.0) * 0.1,
colors.push_back(random_variation_color); debug_face_color.get_s(),
debug_face_color.get_v() + rand.random(-1.0, 1.0) * 0.2);
}
random_variation_color.a = debug_face_color.a;
rs->canvas_item_add_polygon(p_quadrant->debug_canvas_item, vertices, colors); Vector<Color> debug_face_colors;
debug_face_colors.push_back(random_variation_color);
rs->canvas_item_add_polygon(p_quadrant->debug_canvas_item, debug_polygon_vertices, debug_face_colors);
if (enabled_edge_lines) {
Vector<Color> debug_edge_colors;
debug_edge_colors.push_back(debug_edge_color);
debug_polygon_vertices.push_back(debug_polygon_vertices[0]); // Add first again for closing polyline.
rs->canvas_item_add_polyline(p_quadrant->debug_canvas_item, debug_polygon_vertices, debug_edge_colors);
}
} }
} }
} }
} }
} }
} }
#endif // DEBUG_ENABLED
} }
/////////////////////////////// Scenes ////////////////////////////////////// /////////////////////////////// Scenes //////////////////////////////////////

32
servers/navigation_server_2d.cpp
View File

@ -200,6 +200,22 @@ Color NavigationServer2D::get_debug_navigation_link_connection_disabled_color()
return NavigationServer3D::get_singleton()->get_debug_navigation_link_connection_disabled_color(); return NavigationServer3D::get_singleton()->get_debug_navigation_link_connection_disabled_color();
} }
void NavigationServer2D::set_debug_navigation_geometry_edge_color(const Color &p_color) {
NavigationServer3D::get_singleton()->set_debug_navigation_geometry_edge_color(p_color);
}
Color NavigationServer2D::get_debug_navigation_geometry_edge_color() const {
return NavigationServer3D::get_singleton()->get_debug_navigation_geometry_edge_color();
}
void NavigationServer2D::set_debug_navigation_geometry_edge_disabled_color(const Color &p_color) {
NavigationServer3D::get_singleton()->set_debug_navigation_geometry_edge_disabled_color(p_color);
}
Color NavigationServer2D::get_debug_navigation_geometry_edge_disabled_color() const {
return NavigationServer3D::get_singleton()->get_debug_navigation_geometry_edge_disabled_color();
}
void NavigationServer2D::set_debug_navigation_enable_edge_connections(const bool p_value) { void NavigationServer2D::set_debug_navigation_enable_edge_connections(const bool p_value) {
NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_connections(p_value); NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_connections(p_value);
} }
@ -208,6 +224,22 @@ bool NavigationServer2D::get_debug_navigation_enable_edge_connections() const {
return NavigationServer3D::get_singleton()->get_debug_navigation_enable_edge_connections(); return NavigationServer3D::get_singleton()->get_debug_navigation_enable_edge_connections();
} }
void NavigationServer2D::set_debug_navigation_enable_geometry_face_random_color(const bool p_value) {
NavigationServer3D::get_singleton()->set_debug_navigation_enable_geometry_face_random_color(p_value);
}
bool NavigationServer2D::get_debug_navigation_enable_geometry_face_random_color() const {
return NavigationServer3D::get_singleton()->get_debug_navigation_enable_geometry_face_random_color();
}
void NavigationServer2D::set_debug_navigation_enable_edge_lines(const bool p_value) {
NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_lines(p_value);
}
bool NavigationServer2D::get_debug_navigation_enable_edge_lines() const {
return NavigationServer3D::get_singleton()->get_debug_navigation_enable_edge_lines();
}
void NavigationServer2D::set_debug_navigation_agent_path_color(const Color &p_color) { void NavigationServer2D::set_debug_navigation_agent_path_color(const Color &p_color) {
NavigationServer3D::get_singleton()->set_debug_navigation_agent_path_color(p_color); NavigationServer3D::get_singleton()->set_debug_navigation_agent_path_color(p_color);
} }

12
servers/navigation_server_2d.h
View File

@ -247,6 +247,12 @@ public:
void set_debug_navigation_geometry_face_disabled_color(const Color &p_color); void set_debug_navigation_geometry_face_disabled_color(const Color &p_color);
Color get_debug_navigation_geometry_face_disabled_color() const; Color get_debug_navigation_geometry_face_disabled_color() const;
void set_debug_navigation_geometry_edge_color(const Color &p_color);
Color get_debug_navigation_geometry_edge_color() const;
void set_debug_navigation_geometry_edge_disabled_color(const Color &p_color);
Color get_debug_navigation_geometry_edge_disabled_color() const;
void set_debug_navigation_link_connection_color(const Color &p_color); void set_debug_navigation_link_connection_color(const Color &p_color);
Color get_debug_navigation_link_connection_color() const; Color get_debug_navigation_link_connection_color() const;
@ -256,6 +262,12 @@ public:
void set_debug_navigation_enable_edge_connections(const bool p_value); void set_debug_navigation_enable_edge_connections(const bool p_value);
bool get_debug_navigation_enable_edge_connections() const; bool get_debug_navigation_enable_edge_connections() const;
void set_debug_navigation_enable_geometry_face_random_color(const bool p_value);
bool get_debug_navigation_enable_geometry_face_random_color() const;
void set_debug_navigation_enable_edge_lines(const bool p_value);
bool get_debug_navigation_enable_edge_lines() const;
void set_debug_navigation_agent_path_color(const Color &p_color); void set_debug_navigation_agent_path_color(const Color &p_color);
Color get_debug_navigation_agent_path_color() const; Color get_debug_navigation_agent_path_color() const;