godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Merge pull request #100006 from Daylily-Zeleen/daylily-zeleen/hide_debug_instnce

Browse Source 
Hide `NavigationRegion2D`'s debug instance instead of freeing it, and hide it when `navigation_polygon` is set to null.
This commit is contained in:
Thaddeus Crews
2024-12-09 14:33:17 -06:00
parent 5f5f86bff0 4eba3d8377
commit cc59949cfe
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
scene/2d/navigation_region_2d.cpp
View File

@@ -164,16 +164,14 @@ void NavigationRegion2D::_notification(int p_what) {
case NOTIFICATION_VISIBILITY_CHANGED: { case NOTIFICATION_VISIBILITY_CHANGED: {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (debug_instance_rid.is_valid()) { _set_debug_visibile(is_visible_in_tree());
RS::get_singleton()->canvas_item_set_visible(debug_instance_rid, is_visible_in_tree());
}
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
} break; } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
_region_exit_navigation_map(); _region_exit_navigation_map();
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
_free_debug(); _set_debug_visibile(false);
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
} break; } break;
@@ -208,6 +206,13 @@ void NavigationRegion2D::set_navigation_polygon(const Ref<NavigationPolygon> &p_
if (navigation_polygon.is_valid()) { if (navigation_polygon.is_valid()) {
navigation_polygon->connect_changed(callable_mp(this, &NavigationRegion2D::_navigation_polygon_changed)); navigation_polygon->connect_changed(callable_mp(this, &NavigationRegion2D::_navigation_polygon_changed));
} }
#ifdef DEBUG_ENABLED
if (navigation_polygon.is_null()) {
_set_debug_visibile(false);
}
#endif // DEBUG_ENABLED
_navigation_polygon_changed(); _navigation_polygon_changed();
update_configuration_warnings(); update_configuration_warnings();
@@ -392,6 +397,12 @@ NavigationRegion2D::~NavigationRegion2D() {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
NavigationServer2D::get_singleton()->disconnect(SNAME("map_changed"), callable_mp(this, &NavigationRegion2D::_navigation_map_changed)); NavigationServer2D::get_singleton()->disconnect(SNAME("map_changed"), callable_mp(this, &NavigationRegion2D::_navigation_map_changed));
NavigationServer2D::get_singleton()->disconnect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion2D::_navigation_debug_changed)); NavigationServer2D::get_singleton()->disconnect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion2D::_navigation_debug_changed));
if (debug_instance_rid.is_valid()) {
RS::get_singleton()->free(debug_instance_rid);
}
if (debug_mesh_rid.is_valid()) {
RS::get_singleton()->free(debug_mesh_rid);
}
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
} }
@@ -435,7 +446,7 @@ void NavigationRegion2D::_region_update_transform() {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
void NavigationRegion2D::_update_debug_mesh() { void NavigationRegion2D::_update_debug_mesh() {
if (!is_inside_tree()) { if (!is_inside_tree()) {
_free_debug(); _set_debug_visibile(false);
return; return;
} }
@@ -630,17 +641,11 @@ void NavigationRegion2D::_update_debug_baking_rect() {
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
void NavigationRegion2D::_free_debug() { void NavigationRegion2D::_set_debug_visibile(bool p_visible) {
RenderingServer *rs = RenderingServer::get_singleton(); RenderingServer *rs = RenderingServer::get_singleton();
ERR_FAIL_NULL(rs); ERR_FAIL_NULL(rs);
if (debug_instance_rid.is_valid()) { if (debug_instance_rid.is_valid()) {
rs->canvas_item_clear(debug_instance_rid); RS::get_singleton()->canvas_item_set_visible(debug_instance_rid, p_visible);
rs->free(debug_instance_rid);
debug_instance_rid = RID();
}
if (debug_mesh_rid.is_valid()) {
rs->free(debug_mesh_rid);
debug_mesh_rid = RID();
} }
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED

2
scene/2d/navigation_region_2d.h
View File

@@ -57,7 +57,7 @@ private:
bool debug_mesh_dirty = true; bool debug_mesh_dirty = true;
void _free_debug(); void _set_debug_visibile(bool p_visible);
void _update_debug_mesh(); void _update_debug_mesh();
void _update_debug_edge_connections_mesh(); void _update_debug_edge_connections_mesh();
void _update_debug_baking_rect(); void _update_debug_baking_rect();