From 5f6121b71904bc8c6ef57644da1678d7d501ec9a Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 1 Mar 2024 16:07:31 +0100 Subject: [PATCH] Include cleanups. --- .../editor/atlas_merging_dialog.cpp | 4 ++-- .../editor/atlas_merging_dialog.h | 2 +- .../editor/layered_tile_atlas_view.h | 2 +- .../editor/layered_tile_data_editors.cpp | 10 +++++----- .../editor/layered_tile_data_editors.h | 2 +- .../editor/layered_tile_map_layer_editor.cpp | 8 ++++---- .../editor/layered_tile_map_layer_editor.h | 2 +- .../layered_tile_proxies_manager_dialog.cpp | 2 +- .../editor/layered_tile_proxies_manager_dialog.h | 2 +- .../layered_tile_set_atlas_source_editor.cpp | 8 ++++---- .../layered_tile_set_atlas_source_editor.h | 6 +++--- .../editor/layered_tile_set_editor.cpp | 8 ++++---- .../editor/layered_tile_set_editor.h | 8 ++++---- ..._tile_set_scenes_collection_source_editor.cpp | 2 +- ...ed_tile_set_scenes_collection_source_editor.h | 2 +- .../editor/layered_tiles_editor_plugin.cpp | 12 ++++++------ .../editor/layered_tiles_editor_plugin.h | 6 +++--- modules/layered_tile_map/layered_tile_map.cpp | 4 ++-- modules/layered_tile_map/layered_tile_map.h | 4 ++-- .../layered_tile_map/layered_tile_map_layer.cpp | 2 +- .../layered_tile_map/layered_tile_map_layer.h | 2 +- .../layered_tile_map_layer_group.cpp | 4 ++-- modules/layered_tile_map/layered_tile_set.cpp | 16 ++++++++-------- modules/layered_tile_map/layered_tile_set.h | 15 +++++++++------ 24 files changed, 68 insertions(+), 65 deletions(-) diff --git a/modules/layered_tile_map/editor/atlas_merging_dialog.cpp b/modules/layered_tile_map/editor/atlas_merging_dialog.cpp index e20a1a6f6..08b9f24f0 100644 --- a/modules/layered_tile_map/editor/atlas_merging_dialog.cpp +++ b/modules/layered_tile_map/editor/atlas_merging_dialog.cpp @@ -35,9 +35,9 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/gui/editor_file_dialog.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/control.h" +#include "scene/main/control.h" #include "scene/gui/split_container.h" -#include "scene/resources/image_texture.h" +#include "scene/resources/texture.h" void AtlasMergingDialog::_property_changed(const StringName &p_property, const Variant &p_value, const String &p_field, bool p_changing) { _set(p_property, p_value); diff --git a/modules/layered_tile_map/editor/atlas_merging_dialog.h b/modules/layered_tile_map/editor/atlas_merging_dialog.h index b4a71fe19..9b011c9fb 100644 --- a/modules/layered_tile_map/editor/atlas_merging_dialog.h +++ b/modules/layered_tile_map/editor/atlas_merging_dialog.h @@ -36,7 +36,7 @@ #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" #include "scene/gui/texture_rect.h" -#include "scene/resources/2d/tile_set.h" +#include "../layered_tile_set.h" class EditorFileDialog; class EditorPropertyVector2i; diff --git a/modules/layered_tile_map/editor/layered_tile_atlas_view.h b/modules/layered_tile_map/editor/layered_tile_atlas_view.h index 9ebe71632..217a9ca48 100644 --- a/modules/layered_tile_map/editor/layered_tile_atlas_view.h +++ b/modules/layered_tile_map/editor/layered_tile_atlas_view.h @@ -38,7 +38,7 @@ #include "scene/gui/center_container.h" #include "scene/gui/label.h" #include "scene/gui/margin_container.h" -#include "scene/resources/2d/tile_set.h" +#include "../layered_tile_set.h" class ViewPanner; diff --git a/modules/layered_tile_map/editor/layered_tile_data_editors.cpp b/modules/layered_tile_map/editor/layered_tile_data_editors.cpp index 685581979..7ee023444 100644 --- a/modules/layered_tile_map/editor/layered_tile_data_editors.cpp +++ b/modules/layered_tile_map/editor/layered_tile_data_editors.cpp @@ -29,11 +29,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_data_editors.h" +#include "layered_tile_data_editors.h" -#include "tile_set_editor.h" +#include "layered_tile_set_editor.h" -#include "core/math/geometry_2d.h" +#include "core/math/geometry.h" #include "core/os/keyboard.h" #include "editor/editor_node.h" @@ -43,14 +43,14 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/themes/editor_scale.h" -#include "scene/gui/control.h" +#include "scene/main/control.h" #include "scene/gui/label.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" #include "scene/gui/separator.h" #include "scene/gui/spin_box.h" -#include "servers/navigation_server_2d.h" +#include "servers/navigation_2d_server.h" void LayeredTileDataEditor::_tile_set_changed_plan_update() { _tile_set_changed_update_needed = true; diff --git a/modules/layered_tile_map/editor/layered_tile_data_editors.h b/modules/layered_tile_map/editor/layered_tile_data_editors.h index 701340844..55ba75b45 100644 --- a/modules/layered_tile_map/editor/layered_tile_data_editors.h +++ b/modules/layered_tile_map/editor/layered_tile_data_editors.h @@ -35,7 +35,7 @@ #include "tile_atlas_view.h" #include "editor/editor_properties.h" -#include "scene/2d/tile_map.h" +#include "../layered_tile_map.h" #include "scene/gui/box_container.h" #include "scene/gui/panel_container.h" diff --git a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp index 64e460c88..c3a509649 100644 --- a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp +++ b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp @@ -29,9 +29,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_map_layer_editor.h" +#include "layered_tile_map_layer_editor.h" -#include "tiles_editor_plugin.h" +#include "layered_tiles_editor_plugin.h" #include "editor/editor_node.h" #include "editor/editor_resource_preview.h" @@ -41,12 +41,12 @@ #include "editor/themes/editor_scale.h" #include "scene/2d/camera_2d.h" -#include "scene/2d/tile_map_layer.h" +#include "../layered_tile_map_layer.h" #include "scene/gui/center_container.h" #include "scene/gui/split_container.h" #include "core/input/input.h" -#include "core/math/geometry_2d.h" +#include "core/math/geometry.h" #include "core/os/keyboard.h" LayeredTileMapLayer *LayeredTileMapLayerSubEditorPlugin::_get_edited_layer() const { diff --git a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h index 86fba7fb7..4b5b4966b 100644 --- a/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_map_layer_editor.h @@ -36,7 +36,7 @@ #include "core/os/thread.h" #include "core/typedefs.h" -#include "scene/2d/tile_map.h" +#include "../layered_tile_map.h" #include "scene/gui/box_container.h" #include "scene/gui/check_box.h" #include "scene/gui/flow_container.h" diff --git a/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.cpp b/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.cpp index 3792b61af..6474be542 100644 --- a/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.cpp +++ b/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.cpp @@ -29,7 +29,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_proxies_manager_dialog.h" +#include "layered_tile_proxies_manager_dialog.h" #include "editor/editor_properties_vector.h" #include "editor/editor_settings.h" diff --git a/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.h b/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.h index 5060affbf..1e303470b 100644 --- a/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.h +++ b/modules/layered_tile_map/editor/layered_tile_proxies_manager_dialog.h @@ -33,7 +33,7 @@ /*************************************************************************/ #include "editor/editor_properties.h" -#include "scene/2d/tile_map.h" +#include "../layered_tile_map.h" #include "scene/gui/dialogs.h" #include "scene/gui/item_list.h" diff --git a/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.cpp b/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.cpp index 5b55671fd..fbc6d0c5a 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.cpp +++ b/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.cpp @@ -29,9 +29,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_set_atlas_source_editor.h" +#include "layered_tile_set_atlas_source_editor.h" -#include "tiles_editor_plugin.h" +#include "layered_tiles_editor_plugin.h" #include "editor/editor_inspector.h" #include "editor/editor_node.h" @@ -45,7 +45,7 @@ #include "scene/gui/box_container.h" #include "scene/gui/button.h" -#include "scene/gui/control.h" +#include "scene/main/control.h" #include "scene/gui/item_list.h" #include "scene/gui/separator.h" #include "scene/gui/split_container.h" @@ -55,7 +55,7 @@ #include "core/math/geometry_2d.h" #include "core/os/keyboard.h" -#include "servers/navigation_server_2d.h" +#include "servers/navigation_2d_server.h" void LayeredTileSetAtlasSourceEditor::LayeredTileSetAtlasSourceProxyObject::set_id(int p_id) { ERR_FAIL_COND(p_id < 0); diff --git a/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.h b/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.h index aebfde1ce..064482f48 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_set_atlas_source_editor.h @@ -32,11 +32,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_atlas_view.h" -#include "tile_data_editors.h" +#include "layered_tile_atlas_view.h" +#include "layered_tile_data_editors.h" #include "scene/gui/split_container.h" -#include "scene/resources/2d/tile_set.h" +#include "../layered_tile_set.h" class Popup; class LayeredTileSet; diff --git a/modules/layered_tile_map/editor/layered_tile_set_editor.cpp b/modules/layered_tile_map/editor/layered_tile_set_editor.cpp index b1ef556b0..cfffa260d 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_editor.cpp +++ b/modules/layered_tile_map/editor/layered_tile_set_editor.cpp @@ -29,10 +29,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_set_editor.h" +#include "layered_tile_set_editor.h" -#include "tile_data_editors.h" -#include "tiles_editor_plugin.h" +#include "layered_tile_data_editors.h" +#include "layered_tiles_editor_plugin.h" #include "editor/editor_file_system.h" #include "editor/editor_inspector.h" @@ -43,7 +43,7 @@ #include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" -#include "scene/gui/control.h" +#include "scene/main/control.h" #include "scene/gui/dialogs.h" #include "scene/gui/tab_container.h" diff --git a/modules/layered_tile_map/editor/layered_tile_set_editor.h b/modules/layered_tile_map/editor/layered_tile_set_editor.h index 024fd3c7d..a102ef1e1 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_set_editor.h @@ -34,10 +34,10 @@ #include "atlas_merging_dialog.h" #include "scene/gui/tab_bar.h" -#include "scene/resources/2d/tile_set.h" -#include "tile_proxies_manager_dialog.h" -#include "tile_set_atlas_source_editor.h" -#include "tile_set_scenes_collection_source_editor.h" +#include "../layered_tile_set.h" +#include "layered_tile_proxies_manager_dialog.h" +#include "layered_tile_set_atlas_source_editor.h" +#include "layered_tile_set_scenes_collection_source_editor.h" class AcceptDialog; class SpinBox; diff --git a/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.cpp b/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.cpp index fe31ec33a..016f34dbb 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.cpp +++ b/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.cpp @@ -29,7 +29,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_set_scenes_collection_source_editor.h" +#include "layered_tile_set_scenes_collection_source_editor.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" diff --git a/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h b/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h index cb00edbce..0f9268eac 100644 --- a/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h +++ b/modules/layered_tile_map/editor/layered_tile_set_scenes_collection_source_editor.h @@ -34,7 +34,7 @@ #include "editor/editor_inspector.h" #include "scene/gui/box_container.h" -#include "scene/resources/2d/tile_set.h" +#include "../layered_tile_set.h" class Button; class ItemList; diff --git a/modules/layered_tile_map/editor/layered_tiles_editor_plugin.cpp b/modules/layered_tile_map/editor/layered_tiles_editor_plugin.cpp index cba3bb35e..3bfa7594c 100644 --- a/modules/layered_tile_map/editor/layered_tiles_editor_plugin.cpp +++ b/modules/layered_tile_map/editor/layered_tiles_editor_plugin.cpp @@ -29,9 +29,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tiles_editor_plugin.h" +#include "layered_tiles_editor_plugin.h" -#include "tile_set_editor.h" +#include "layered_tile_set_editor.h" #include "core/os/mutex.h" @@ -42,13 +42,13 @@ #include "editor/gui/editor_bottom_panel.h" #include "editor/plugins/canvas_item_editor_plugin.h" #include "editor/themes/editor_scale.h" -#include "scene/2d/tile_map.h" -#include "scene/2d/tile_map_layer.h" +#include "../layered_tile_map.h" +#include "../layered_tile_map_layer.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" -#include "scene/gui/control.h" +#include "scene/main/control.h" #include "scene/gui/separator.h" -#include "scene/resources/2d/tile_set.h" +#include "../layered_tile_set.h" #include "scene/resources/image_texture.h" LayeredTilesEditorUtils *LayeredTilesEditorUtils::singleton = nullptr; diff --git a/modules/layered_tile_map/editor/layered_tiles_editor_plugin.h b/modules/layered_tile_map/editor/layered_tiles_editor_plugin.h index 8a6d474dd..32736ba93 100644 --- a/modules/layered_tile_map/editor/layered_tiles_editor_plugin.h +++ b/modules/layered_tile_map/editor/layered_tiles_editor_plugin.h @@ -35,9 +35,9 @@ #include "editor/editor_plugin.h" #include "scene/gui/box_container.h" -#include "tile_atlas_view.h" -#include "tile_map_layer_editor.h" -#include "tile_set_editor.h" +#include "layered_tile_atlas_view.h" +#include "layered_tile_map_layer_editor.h" +#include "layered_tile_set_editor.h" class LayeredTilesEditorUtils : public Object { GDCLASS(LayeredTilesEditorUtils, Object); diff --git a/modules/layered_tile_map/layered_tile_map.cpp b/modules/layered_tile_map/layered_tile_map.cpp index a3e812283..259ff114b 100644 --- a/modules/layered_tile_map/layered_tile_map.cpp +++ b/modules/layered_tile_map/layered_tile_map.cpp @@ -29,8 +29,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_map.compat.inc" -#include "tile_map.h" +#include "layered_tile_map.compat.inc" +#include "layered_tile_map.h" #include "core/core_string_names.h" #include "scene/2d/tile_map_layer.h" diff --git a/modules/layered_tile_map/layered_tile_map.h b/modules/layered_tile_map/layered_tile_map.h index a0fdaa10a..4a6094d04 100644 --- a/modules/layered_tile_map/layered_tile_map.h +++ b/modules/layered_tile_map/layered_tile_map.h @@ -32,8 +32,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/2d/tile_map_layer_group.h" -#include "scene/resources/2d/tile_set.h" +#include "layered_tile_map_layer_group.h" +#include "layered_tile_set.h" class Control; class LayeredTileMapLayer; diff --git a/modules/layered_tile_map/layered_tile_map_layer.cpp b/modules/layered_tile_map/layered_tile_map_layer.cpp index f56910897..f91cf897d 100644 --- a/modules/layered_tile_map/layered_tile_map_layer.cpp +++ b/modules/layered_tile_map/layered_tile_map_layer.cpp @@ -29,7 +29,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_map_layer.h" +#include "layered_tile_map_layer.h" #include "core/core_string_names.h" #include "core/io/marshalls.h" diff --git a/modules/layered_tile_map/layered_tile_map_layer.h b/modules/layered_tile_map/layered_tile_map_layer.h index 6ebf57bca..7a475e0f7 100644 --- a/modules/layered_tile_map/layered_tile_map_layer.h +++ b/modules/layered_tile_map/layered_tile_map_layer.h @@ -33,7 +33,7 @@ /*************************************************************************/ #include "scene/2d/tile_map.h" -#include "scene/resources/2d/tile_set.h" +#include "layered_tile_set.h" class LayeredTileSetAtlasSource; diff --git a/modules/layered_tile_map/layered_tile_map_layer_group.cpp b/modules/layered_tile_map/layered_tile_map_layer_group.cpp index 4880b60e4..ad2f2649a 100644 --- a/modules/layered_tile_map/layered_tile_map_layer_group.cpp +++ b/modules/layered_tile_map/layered_tile_map_layer_group.cpp @@ -29,10 +29,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_map_layer_group.h" +#include "layered_tile_map_layer_group.h" #include "core/core_string_names.h" -#include "scene/2d/tile_map_layer.h" +#include "layered_tile_map_layer.h" #include "scene/resources/2d/tile_set.h" #ifdef TOOLS_ENABLED diff --git a/modules/layered_tile_map/layered_tile_set.cpp b/modules/layered_tile_map/layered_tile_set.cpp index 9b0e1a3dd..547f5d9e0 100644 --- a/modules/layered_tile_map/layered_tile_set.cpp +++ b/modules/layered_tile_map/layered_tile_set.cpp @@ -29,16 +29,16 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "tile_set.compat.inc" -#include "tile_set.h" +#include "layered_tile_set.compat.inc" +#include "layered_tile_set.h" #include "core/io/marshalls.h" -#include "core/math/geometry_2d.h" -#include "core/templates/local_vector.h" -#include "core/templates/rb_set.h" -#include "scene/gui/control.h" -#include "scene/resources/image_texture.h" -#include "servers/navigation_server_2d.h" +#include "core/math/geometry.h" +#include "core/containers/local_vector.h" +#include "core/containers/rb_set.h" +#include "scene/main/control.h" +#include "scene/resources/texture.h" +#include "servers/navigation_2d_server.h" /////////////////////////////// LayeredTileMapPattern ////////////////////////////////////// diff --git a/modules/layered_tile_map/layered_tile_set.h b/modules/layered_tile_map/layered_tile_set.h index 55a0f7a26..8e132a5d1 100644 --- a/modules/layered_tile_map/layered_tile_set.h +++ b/modules/layered_tile_map/layered_tile_set.h @@ -32,17 +32,20 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/io/resource.h" +#include "core/containers/local_vector.h" +#include "core/containers/rb_set.h" + +#include "core/object/resource.h" #include "core/object/object.h" -#include "core/templates/local_vector.h" -#include "core/templates/rb_set.h" + #include "scene/2d/light_occluder_2d.h" #include "scene/main/canvas_item.h" -#include "scene/resources/2d/convex_polygon_shape_2d.h" -#include "scene/resources/image_texture.h" -#include "scene/resources/navigation_polygon.h" + +#include "scene/resources/texture.h" +#include "scene/resources/navigation_2d/navigation_polygon.h" #include "scene/resources/packed_scene.h" #include "scene/resources/physics_material.h" +#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" #ifndef DISABLE_DEPRECATED #include "scene/resources/shader.h"