diff options
| -rw-r--r-- | scene/2d/navigation_region_2d.cpp | 12 | ||||
| -rw-r--r-- | scene/2d/navigation_region_2d.h | 1 | ||||
| -rw-r--r-- | scene/3d/navigation_region_3d.cpp | 15 | ||||
| -rw-r--r-- | scene/3d/navigation_region_3d.h | 1 |
4 files changed, 23 insertions, 6 deletions
diff --git a/scene/2d/navigation_region_2d.cpp b/scene/2d/navigation_region_2d.cpp index 38ca1d98ef..134ca065ce 100644 --- a/scene/2d/navigation_region_2d.cpp +++ b/scene/2d/navigation_region_2d.cpp @@ -275,6 +275,14 @@ void NavigationRegion2D::_navigation_map_changed(RID p_map) { } #endif // DEBUG_ENABLED +#ifdef DEBUG_ENABLED +void NavigationRegion2D::_navigation_debug_changed() { + if (is_inside_tree()) { + queue_redraw(); + } +} +#endif // DEBUG_ENABLED + Array NavigationRegion2D::get_configuration_warnings() const { Array warnings = Node2D::get_configuration_warnings(); @@ -374,7 +382,7 @@ NavigationRegion2D::NavigationRegion2D() { #ifdef DEBUG_ENABLED NavigationServer2D::get_singleton()->connect(SNAME("map_changed"), callable_mp(this, &NavigationRegion2D::_navigation_map_changed)); - NavigationServer2D::get_singleton()->connect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion2D::_navigation_map_changed)); + NavigationServer2D::get_singleton()->connect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion2D::_navigation_debug_changed)); #endif // DEBUG_ENABLED } @@ -391,7 +399,7 @@ NavigationRegion2D::~NavigationRegion2D() { #ifdef DEBUG_ENABLED 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_map_changed)); + NavigationServer2D::get_singleton()->disconnect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion2D::_navigation_debug_changed)); #endif // DEBUG_ENABLED } diff --git a/scene/2d/navigation_region_2d.h b/scene/2d/navigation_region_2d.h index f7ae3c5741..9e9a21d9f3 100644 --- a/scene/2d/navigation_region_2d.h +++ b/scene/2d/navigation_region_2d.h @@ -59,6 +59,7 @@ private: void _update_debug_mesh(); void _update_debug_edge_connections_mesh(); void _navigation_map_changed(RID p_map); + void _navigation_debug_changed(); #endif // DEBUG_ENABLED protected: diff --git a/scene/3d/navigation_region_3d.cpp b/scene/3d/navigation_region_3d.cpp index de6c6e6f11..5d258d394a 100644 --- a/scene/3d/navigation_region_3d.cpp +++ b/scene/3d/navigation_region_3d.cpp @@ -361,6 +361,15 @@ void NavigationRegion3D::_navigation_map_changed(RID p_map) { } #endif // DEBUG_ENABLED +#ifdef DEBUG_ENABLED +void NavigationRegion3D::_navigation_debug_changed() { + if (is_inside_tree()) { + _update_debug_mesh(); + _update_debug_edge_connections_mesh(); + } +} +#endif // DEBUG_ENABLED + void NavigationRegion3D::_region_enter_navigation_map() { if (!is_inside_tree()) { return; @@ -426,8 +435,7 @@ NavigationRegion3D::NavigationRegion3D() { #ifdef DEBUG_ENABLED NavigationServer3D::get_singleton()->connect(SNAME("map_changed"), callable_mp(this, &NavigationRegion3D::_navigation_map_changed)); - NavigationServer3D::get_singleton()->connect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion3D::_update_debug_mesh)); - NavigationServer3D::get_singleton()->connect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion3D::_update_debug_edge_connections_mesh)); + NavigationServer3D::get_singleton()->connect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion3D::_navigation_debug_changed)); #endif // DEBUG_ENABLED } @@ -440,8 +448,7 @@ NavigationRegion3D::~NavigationRegion3D() { #ifdef DEBUG_ENABLED NavigationServer3D::get_singleton()->disconnect(SNAME("map_changed"), callable_mp(this, &NavigationRegion3D::_navigation_map_changed)); - NavigationServer3D::get_singleton()->disconnect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion3D::_update_debug_mesh)); - NavigationServer3D::get_singleton()->disconnect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion3D::_update_debug_edge_connections_mesh)); + NavigationServer3D::get_singleton()->disconnect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationRegion3D::_navigation_debug_changed)); ERR_FAIL_NULL(RenderingServer::get_singleton()); if (debug_instance.is_valid()) { diff --git a/scene/3d/navigation_region_3d.h b/scene/3d/navigation_region_3d.h index 33140d4d71..b6dde0bec8 100644 --- a/scene/3d/navigation_region_3d.h +++ b/scene/3d/navigation_region_3d.h @@ -61,6 +61,7 @@ private: void _update_debug_mesh(); void _update_debug_edge_connections_mesh(); void _navigation_map_changed(RID p_map); + void _navigation_debug_changed(); #endif // DEBUG_ENABLED protected: |