Navigation: Reduce include dependencies with forward declares

editor/scene/2d/tiles/tile_atlas_view.cpp

@@ -39,6 +39,7 @@
 #include "scene/gui/label.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/view_panner.h"
+#include "scene/resources/material.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_enums.h"
 

editor/scene/2d/tiles/tile_data_editors.cpp

@@ -49,6 +49,7 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
 #include "scene/main/scene_tree.h"
+#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 

editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp

@@ -47,6 +47,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"
+#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
 void TileSetAtlasSourceEditor::TileSetAtlasSourceProxyObject::set_id(int p_id) {

editor/scene/3d/mesh_instance_3d_editor_plugin.cpp

@@ -53,6 +53,7 @@
 #include "scene/resources/3d/cylinder_shape_3d.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/3d/sphere_shape_3d.h"
+#include "scene/resources/navigation_mesh.h"
 
 void MeshInstance3DEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {

modules/csg/csg_shape.cpp

@@ -36,6 +36,7 @@
 #include "core/object/class_db.h"
 #include "scene/main/scene_tree.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/rendering/rendering_server.h"
 

modules/navigation_2d/2d/godot_navigation_server_2d.cpp

@@ -30,15 +30,17 @@
 
 #include "godot_navigation_server_2d.h"
 
+#ifdef CLIPPER2_ENABLED
+#include "nav_mesh_generator_2d.h"
+#endif // CLIPPER2_ENABLED
+
 #include "core/os/mutex.h"
 #include "scene/main/node.h"
+#include "servers/navigation_2d/navigation_path_query_parameters_2d.h"
+#include "servers/navigation_2d/navigation_path_query_result_2d.h"
 
 #include <cstdint>
 
-#ifdef CLIPPER2_ENABLED
-#include "nav_mesh_generator_2d.h"
-#endif // CLIPPER2_ENABLED
-
 #define COMMAND_1(F_NAME, T_0, D_0) \
 	struct MERGE(F_NAME, _command_2d) : public SetCommand2D { \
 		T_0 d_0; \

modules/navigation_2d/2d/godot_navigation_server_2d.h

@@ -39,10 +39,14 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/rid.h"
 #include "core/templates/rid_owner.h"
-#include "servers/navigation_2d/navigation_path_query_parameters_2d.h"
-#include "servers/navigation_2d/navigation_path_query_result_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
+class GodotNavigationServer2D;
+
+#ifdef CLIPPER2_ENABLED
+class NavMeshGenerator2D;
+#endif // CLIPPER2_ENABLED
+
 /// The commands are functions executed during the `sync` phase.
 
 #define MERGE_INTERNAL(A, B) A##B
@@ -56,11 +60,6 @@
 	virtual void F_NAME(T_0 D_0, T_1 D_1) override; \
 	void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
 
-class GodotNavigationServer2D;
-#ifdef CLIPPER2_ENABLED
-class NavMeshGenerator2D;
-#endif // CLIPPER2_ENABLED
-
 struct SetCommand2D {
 	virtual ~SetCommand2D() {}
 	virtual void exec(GodotNavigationServer2D *p_server) = 0;

modules/navigation_2d/2d/nav_mesh_generator_2d.cpp

@@ -36,8 +36,7 @@
 #include "scene/2d/node_2d.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
-#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/2d/navigation_polygon.h"
+#include "servers/navigation_2d/navigation_server_2d.h"
 
 #include <thirdparty/clipper2/include/clipper2/clipper.h>
 #include <thirdparty/misc/polypartition.h>

modules/navigation_2d/2d/nav_mesh_generator_2d.h

@@ -34,11 +34,11 @@
 
 #include "core/object/object.h"
 #include "core/object/worker_thread_pool.h"
-#include "servers/navigation_2d/navigation_server_2d.h"
+#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/2d/navigation_polygon.h"
 
 class Node;
-class NavigationPolygon;
-class NavigationMeshSourceGeometryData2D;
+struct NavMeshGeometryParser2D;
 
 class NavMeshGenerator2D : public Object {
 	GDSOFTCLASS(NavMeshGenerator2D, Object);

modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp

@@ -35,6 +35,7 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
+#include "scene/2d/navigation/navigation_link_2d.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 

modules/navigation_2d/editor/navigation_link_2d_editor_plugin.h

@@ -31,9 +31,10 @@
 #pragma once
 
 #include "editor/plugins/editor_plugin.h"
-#include "scene/2d/navigation/navigation_link_2d.h"
+#include "scene/gui/control.h"
 
 class CanvasItemEditor;
+class NavigationLink2D;
 
 class NavigationLink2DEditor : public Control {
 	GDCLASS(NavigationLink2DEditor, Control);

modules/navigation_2d/editor/navigation_obstacle_2d_editor_plugin.cpp

@@ -31,6 +31,7 @@
 #include "navigation_obstacle_2d_editor_plugin.h"
 
 #include "editor/editor_undo_redo_manager.h"
+#include "scene/2d/navigation/navigation_obstacle_2d.h"
 
 Node2D *NavigationObstacle2DEditor::_get_node() const {
 	return node;

modules/navigation_2d/editor/navigation_obstacle_2d_editor_plugin.h

@@ -31,7 +31,8 @@
 #pragma once
 
 #include "editor/scene/2d/abstract_polygon_2d_editor.h"
-#include "scene/2d/navigation/navigation_obstacle_2d.h"
+
+class NavigationObstacle2D;
 
 class NavigationObstacle2DEditor : public AbstractPolygon2DEditor {
 	GDCLASS(NavigationObstacle2DEditor, AbstractPolygon2DEditor);

modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp

@@ -37,6 +37,7 @@
 #include "scene/2d/navigation/navigation_region_2d.h"
 #include "scene/gui/dialogs.h"
 #include "scene/main/timer.h"
+#include "scene/resources/2d/navigation_polygon.h"
 
 Ref<NavigationPolygon> NavigationRegion2DEditor::_ensure_navpoly() const {
 	Ref<NavigationPolygon> navpoly = node->get_navigation_polygon();

modules/navigation_2d/editor/navigation_region_2d_editor_plugin.h

@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "editor/plugins/editor_plugin.h"
 #include "editor/scene/2d/abstract_polygon_2d_editor.h"
 
 class AcceptDialog;

modules/navigation_2d/nav_link_2d.h

@@ -32,9 +32,9 @@
 
 #include "2d/nav_base_iteration_2d.h"
 #include "nav_base_2d.h"
-#include "nav_utils_2d.h"
 
 #include "core/os/rw_lock.h"
+#include "core/templates/self_list.h"
 
 class NavLinkIteration2D : public NavBaseIteration2D {
 	GDCLASS(NavLinkIteration2D, NavBaseIteration2D);
@@ -54,8 +54,6 @@ class NavLinkIteration2D : public NavBaseIteration2D {
 	}
 };
 
-#include "core/templates/self_list.h"
-
 class NavLink2D : public NavBase2D {
 	NavMap2D *map = nullptr;
 	bool bidirectional = true;

modules/navigation_2d/nav_map_2d.cpp

@@ -31,7 +31,6 @@
 #include "nav_map_2d.h"
 
 #include "2d/nav_map_builder_2d.h"
-#include "2d/nav_mesh_queries_2d.h"
 #include "2d/nav_region_iteration_2d.h"
 #include "nav_agent_2d.h"
 #include "nav_link_2d.h"
@@ -43,6 +42,7 @@
 #include "core/os/os.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
+#include <KdTree2d.h>
 #include <Obstacle2d.h>
 
 using namespace Nav2D;

modules/navigation_2d/nav_map_2d.h

@@ -40,7 +40,6 @@
 #include "core/os/rw_lock.h"
 #include "servers/navigation_2d/navigation_constants_2d.h"
 
-#include <KdTree2d.h>
 #include <RVOSimulator2d.h>
 
 class NavLink2D;

modules/navigation_2d/nav_region_2d.cpp

@@ -32,7 +32,6 @@
 
 #include "2d/nav_mesh_queries_2d.h"
 #include "2d/nav_region_builder_2d.h"
-#include "2d/nav_region_iteration_2d.h"
 #include "nav_map_2d.h"
 
 #include "core/config/project_settings.h"

modules/navigation_2d/nav_region_2d.h

@@ -34,6 +34,7 @@
 #include "nav_base_2d.h"
 #include "nav_utils_2d.h"
 
+#include "core/object/worker_thread_pool.h"
 #include "core/os/rw_lock.h"
 #include "scene/resources/2d/navigation_polygon.h"
 

modules/navigation_3d/3d/godot_navigation_server_3d.cpp

@@ -34,6 +34,9 @@
 
 #include "core/os/mutex.h"
 #include "scene/main/node.h"
+#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
+#include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
+#include "servers/navigation_3d/navigation_path_query_result_3d.h"
 
 using namespace NavigationDefaults3D;
 

modules/navigation_3d/3d/godot_navigation_server_3d.h

@@ -39,10 +39,11 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/rid.h"
 #include "core/templates/rid_owner.h"
-#include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
-#include "servers/navigation_3d/navigation_path_query_result_3d.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
+class GodotNavigationServer3D;
+class NavMeshGenerator3D;
+
 /// The commands are functions executed during the `sync` phase.
 
 #define MERGE_INTERNAL(A, B) A##B
@@ -56,9 +57,6 @@
 	virtual void F_NAME(T_0 D_0, T_1 D_1) override; \
 	void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
 
-class GodotNavigationServer3D;
-class NavMeshGenerator3D;
-
 struct SetCommand3D {
 	virtual ~SetCommand3D() {}
 	virtual void exec(GodotNavigationServer3D *server) = 0;

modules/navigation_3d/3d/nav_mesh_generator_3d.cpp

@@ -34,8 +34,7 @@
 #include "core/os/thread.h"
 #include "scene/3d/node_3d.h"
 #include "scene/main/scene_tree.h"
-#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
-#include "scene/resources/navigation_mesh.h"
+#include "servers/navigation_3d/navigation_server_3d.h"
 
 #include <Recast.h>
 

modules/navigation_3d/3d/nav_mesh_generator_3d.h

@@ -32,11 +32,12 @@
 
 #include "core/object/object.h"
 #include "core/object/worker_thread_pool.h"
-#include "servers/navigation_3d/navigation_server_3d.h"
+#include "core/os/rw_lock.h"
+#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation_mesh.h"
 
 class Node;
-class NavigationMesh;
-class NavigationMeshSourceGeometryData3D;
+struct NavMeshGeometryParser3D;
 
 class NavMeshGenerator3D : public Object {
 	GDSOFTCLASS(NavMeshGenerator3D, Object);

modules/navigation_3d/3d/navigation_mesh_generator.cpp

@@ -33,6 +33,7 @@
 #include "core/object/class_db.h"
 #include "scene/main/node.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
 NavigationMeshGenerator *NavigationMeshGenerator::singleton = nullptr;

modules/navigation_3d/3d/navigation_mesh_generator.h

@@ -30,9 +30,11 @@
 
 #pragma once
 
-#include "scene/resources/navigation_mesh.h"
+#include "core/object/object.h"
 
+class NavigationMesh;
 class NavigationMeshSourceGeometryData3D;
+class Node;
 
 class NavigationMeshGenerator : public Object {
 	GDCLASS(NavigationMeshGenerator, Object);

modules/navigation_3d/editor/navigation_link_3d_editor_plugin.h

@@ -34,6 +34,8 @@
 
 #include "editor/plugins/editor_plugin.h"
 
+class NavigationLink3DGizmoPlugin;
+
 class NavigationLink3DEditorPlugin : public EditorPlugin {
 	GDCLASS(NavigationLink3DEditorPlugin, EditorPlugin);
 

modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp

@@ -39,6 +39,7 @@
 #include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/3d/navigation/navigation_obstacle_3d.h"
+#include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/main/scene_tree.h"

modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.h

@@ -32,10 +32,10 @@
 
 #include "editor/plugins/editor_plugin.h"
 #include "editor/scene/3d/node_3d_editor_gizmos.h"
-#include "scene/gui/box_container.h"
 
 class Button;
 class ConfirmationDialog;
+class HBoxContainer;
 class NavigationObstacle3D;
 
 class NavigationObstacle3DGizmoPlugin : public EditorNode3DGizmoPlugin {

modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp

@@ -41,6 +41,7 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
 #include "scene/main/scene_tree.h"
+#include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
 void NavigationRegion3DEditor::_node_removed(Node *p_node) {

modules/navigation_3d/editor/navigation_region_3d_editor_plugin.h

@@ -33,6 +33,7 @@
 #include "navigation_region_3d_gizmo_plugin.h"
 
 #include "editor/plugins/editor_plugin.h"
+#include "scene/gui/control.h"
 
 class AcceptDialog;
 class Button;

modules/navigation_3d/editor/navigation_region_3d_gizmo_plugin.cpp

@@ -32,6 +32,7 @@
 
 #include "core/math/random_pcg.h"
 #include "scene/3d/navigation/navigation_region_3d.h"
+#include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
 NavigationRegion3DGizmoPlugin::NavigationRegion3DGizmoPlugin() {

modules/navigation_3d/nav_region_3d.h

@@ -34,6 +34,7 @@
 #include "nav_base_3d.h"
 #include "nav_utils_3d.h"
 
+#include "core/object/worker_thread_pool.h"
 #include "core/os/rw_lock.h"
 #include "scene/resources/navigation_mesh.h"
 

scene/2d/navigation/navigation_obstacle_2d.cpp

@@ -37,6 +37,7 @@
 #include "scene/main/scene_tree.h"
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
+#include "scene/resources/mesh.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 #include "servers/rendering/rendering_server.h"

scene/2d/navigation/navigation_region_2d.cpp

@@ -35,6 +35,9 @@
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "scene/main/scene_tree.h"
+#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/2d/navigation_polygon.h"
+#include "scene/resources/mesh.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 #include "servers/rendering/rendering_server.h"

scene/2d/navigation/navigation_region_2d.h

@@ -31,7 +31,8 @@
 #pragma once
 
 #include "scene/2d/node_2d.h"
-#include "scene/resources/2d/navigation_polygon.h"
+
+class NavigationPolygon;
 
 class NavigationRegion2D : public Node2D {
 	GDCLASS(NavigationRegion2D, Node2D);