Merge pull request #50148 from aaronfranke/move-resources

Move 2D and 3D resources to their own folders

editor/import/3d/editor_import_collada.cpp

@@ -41,8 +41,8 @@
 #include "scene/3d/path_3d.h"
 #include "scene/3d/skeleton_3d.h"
 #include "scene/animation/animation_player.h"
+#include "scene/resources/3d/importer_mesh.h"
 #include "scene/resources/animation.h"
-#include "scene/resources/importer_mesh.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/surface_tool.h"
 

editor/import/3d/resource_importer_obj.cpp

@@ -35,7 +35,7 @@
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/node_3d.h"
-#include "scene/resources/importer_mesh.h"
+#include "scene/resources/3d/importer_mesh.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/surface_tool.h"
 

editor/import/3d/resource_importer_scene.cpp

@@ -46,15 +46,15 @@
 #include "scene/3d/physics_body_3d.h"
 #include "scene/3d/vehicle_body_3d.h"
 #include "scene/animation/animation_player.h"
+#include "scene/resources/3d/box_shape_3d.h"
+#include "scene/resources/3d/importer_mesh.h"
+#include "scene/resources/3d/separation_ray_shape_3d.h"
+#include "scene/resources/3d/sphere_shape_3d.h"
+#include "scene/resources/3d/world_boundary_shape_3d.h"
 #include "scene/resources/animation.h"
-#include "scene/resources/box_shape_3d.h"
-#include "scene/resources/importer_mesh.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/resource_format_text.h"
-#include "scene/resources/separation_ray_shape_3d.h"
-#include "scene/resources/sphere_shape_3d.h"
 #include "scene/resources/surface_tool.h"
-#include "scene/resources/world_boundary_shape_3d.h"
 
 uint32_t EditorSceneFormatImporter::get_import_flags() const {
 	uint32_t ret;

editor/import/3d/resource_importer_scene.h

@@ -35,14 +35,14 @@
 #include "core/io/resource_importer.h"
 #include "core/variant/dictionary.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
+#include "scene/resources/3d/box_shape_3d.h"
+#include "scene/resources/3d/capsule_shape_3d.h"
+#include "scene/resources/3d/cylinder_shape_3d.h"
+#include "scene/resources/3d/importer_mesh.h"
+#include "scene/resources/3d/skin.h"
+#include "scene/resources/3d/sphere_shape_3d.h"
 #include "scene/resources/animation.h"
-#include "scene/resources/box_shape_3d.h"
-#include "scene/resources/capsule_shape_3d.h"
-#include "scene/resources/cylinder_shape_3d.h"
-#include "scene/resources/importer_mesh.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/shape_3d.h"
-#include "scene/resources/sphere_shape_3d.h"
 
 class Material;
 class AnimationPlayer;

editor/import/3d/scene_import_settings.cpp

@@ -40,7 +40,7 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/animation/animation_player.h"
-#include "scene/resources/importer_mesh.h"
+#include "scene/resources/3d/importer_mesh.h"
 #include "scene/resources/surface_tool.h"
 
 class SceneImportSettingsData : public Object {

editor/import/3d/scene_import_settings.h

@@ -46,7 +46,7 @@
 #include "scene/gui/subviewport_container.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/tree.h"
-#include "scene/resources/primitive_meshes.h"
+#include "scene/resources/3d/primitive_meshes.h"
 
 class EditorFileDialog;
 class EditorInspector;

editor/plugins/collision_shape_2d_editor_plugin.cpp

@@ -35,14 +35,14 @@
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "scene/resources/capsule_shape_2d.h"
-#include "scene/resources/circle_shape_2d.h"
-#include "scene/resources/concave_polygon_shape_2d.h"
-#include "scene/resources/convex_polygon_shape_2d.h"
-#include "scene/resources/rectangle_shape_2d.h"
-#include "scene/resources/segment_shape_2d.h"
-#include "scene/resources/separation_ray_shape_2d.h"
-#include "scene/resources/world_boundary_shape_2d.h"
+#include "scene/resources/2d/capsule_shape_2d.h"
+#include "scene/resources/2d/circle_shape_2d.h"
+#include "scene/resources/2d/concave_polygon_shape_2d.h"
+#include "scene/resources/2d/convex_polygon_shape_2d.h"
+#include "scene/resources/2d/rectangle_shape_2d.h"
+#include "scene/resources/2d/segment_shape_2d.h"
+#include "scene/resources/2d/separation_ray_shape_2d.h"
+#include "scene/resources/2d/world_boundary_shape_2d.h"
 #include "scene/scene_string_names.h"
 
 CollisionShape2DEditor::CollisionShape2DEditor() {

editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp

@@ -37,15 +37,15 @@
 #include "editor/plugins/gizmos/gizmo_3d_helper.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/collision_shape_3d.h"
-#include "scene/resources/box_shape_3d.h"
-#include "scene/resources/capsule_shape_3d.h"
-#include "scene/resources/concave_polygon_shape_3d.h"
-#include "scene/resources/convex_polygon_shape_3d.h"
-#include "scene/resources/cylinder_shape_3d.h"
-#include "scene/resources/height_map_shape_3d.h"
-#include "scene/resources/separation_ray_shape_3d.h"
-#include "scene/resources/sphere_shape_3d.h"
-#include "scene/resources/world_boundary_shape_3d.h"
+#include "scene/resources/3d/box_shape_3d.h"
+#include "scene/resources/3d/capsule_shape_3d.h"
+#include "scene/resources/3d/concave_polygon_shape_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
+#include "scene/resources/3d/cylinder_shape_3d.h"
+#include "scene/resources/3d/height_map_shape_3d.h"
+#include "scene/resources/3d/separation_ray_shape_3d.h"
+#include "scene/resources/3d/sphere_shape_3d.h"
+#include "scene/resources/3d/world_boundary_shape_3d.h"
 
 CollisionShape3DGizmoPlugin::CollisionShape3DGizmoPlugin() {
 	helper.instantiate();

editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.cpp

@@ -33,7 +33,7 @@
 #include "editor/editor_settings.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/spring_arm_3d.h"
-#include "scene/resources/shape_3d.h"
+#include "scene/resources/3d/shape_3d.h"
 
 void SpringArm3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	SpringArm3D *spring_arm = Object::cast_to<SpringArm3D>(p_gizmo->get_node_3d());

editor/plugins/material_editor_plugin.cpp

@@ -43,9 +43,9 @@
 #include "scene/gui/color_rect.h"
 #include "scene/gui/subviewport_container.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/fog_material.h"
+#include "scene/resources/3d/fog_material.h"
+#include "scene/resources/3d/sky_material.h"
 #include "scene/resources/particle_process_material.h"
-#include "scene/resources/sky_material.h"
 
 void MaterialEditor::gui_input(const Ref<InputEvent> &p_event) {
 	ERR_FAIL_COND(p_event.is_null());

editor/plugins/material_editor_plugin.h

@@ -34,8 +34,8 @@
 #include "editor/editor_inspector.h"
 #include "editor/editor_plugin.h"
 #include "editor/plugins/editor_resource_conversion_plugin.h"
+#include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/material.h"
-#include "scene/resources/primitive_meshes.h"
 
 class Camera3D;
 class ColorRect;

editor/plugins/mesh_instance_3d_editor_plugin.cpp

@@ -42,9 +42,9 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/spin_box.h"
-#include "scene/resources/concave_polygon_shape_3d.h"
-#include "scene/resources/convex_polygon_shape_3d.h"
-#include "scene/resources/primitive_meshes.h"
+#include "scene/resources/3d/concave_polygon_shape_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
+#include "scene/resources/3d/primitive_meshes.h"
 #include "scene/scene_string_names.h"
 
 void MeshInstance3DEditor::_node_removed(Node *p_node) {

editor/plugins/mesh_library_editor_plugin.h

@@ -32,7 +32,7 @@
 #define MESH_LIBRARY_EDITOR_PLUGIN_H
 
 #include "editor/editor_plugin.h"
-#include "scene/resources/mesh_library.h"
+#include "scene/resources/3d/mesh_library.h"
 
 class EditorFileDialog;
 class ConfirmationDialog;

editor/plugins/node_3d_editor_gizmos.cpp

@@ -36,7 +36,7 @@
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
-#include "scene/resources/primitive_meshes.h"
+#include "scene/resources/3d/primitive_meshes.h"
 
 #define HANDLE_HALF_SIZE 9.5
 

editor/plugins/node_3d_editor_plugin.cpp

@@ -90,8 +90,8 @@
 #include "scene/gui/flow_container.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/subviewport_container.h"
+#include "scene/resources/3d/sky_material.h"
 #include "scene/resources/packed_scene.h"
-#include "scene/resources/sky_material.h"
 #include "scene/resources/surface_tool.h"
 
 constexpr real_t DISTANCE_DEFAULT = 4;

editor/plugins/skeleton_3d_editor_plugin.cpp

@@ -46,9 +46,8 @@
 #include "scene/3d/physics_body_3d.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/resources/capsule_shape_3d.h"
+#include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/skeleton_profile.h"
-#include "scene/resources/sphere_shape_3d.h"
 #include "scene/resources/surface_tool.h"
 #include "scene/scene_string_names.h"
 

editor/plugins/tiles/atlas_merging_dialog.h

@@ -35,7 +35,7 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/texture_rect.h"
-#include "scene/resources/tile_set.h"
+#include "scene/resources/2d/tile_set.h"
 
 class EditorFileDialog;
 class EditorPropertyVector2i;

editor/plugins/tiles/tile_atlas_view.h

@@ -37,7 +37,7 @@
 #include "scene/gui/center_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/margin_container.h"
-#include "scene/resources/tile_set.h"
+#include "scene/resources/2d/tile_set.h"
 
 class ViewPanner;
 

editor/plugins/tiles/tile_set_atlas_source_editor.h

@@ -35,7 +35,7 @@
 #include "tile_data_editors.h"
 
 #include "scene/gui/split_container.h"
-#include "scene/resources/tile_set.h"
+#include "scene/resources/2d/tile_set.h"
 
 class Popup;
 class TileSet;

editor/plugins/tiles/tile_set_editor.h

@@ -33,7 +33,7 @@
 
 #include "atlas_merging_dialog.h"
 #include "scene/gui/tab_bar.h"
-#include "scene/resources/tile_set.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"

editor/plugins/tiles/tile_set_scenes_collection_source_editor.h

@@ -33,7 +33,7 @@
 
 #include "editor/editor_inspector.h"
 #include "scene/gui/box_container.h"
-#include "scene/resources/tile_set.h"
+#include "scene/resources/2d/tile_set.h"
 
 class Button;
 class ItemList;

editor/plugins/tiles/tiles_editor_plugin.cpp

@@ -47,8 +47,8 @@
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"
 #include "scene/gui/separator.h"
+#include "scene/resources/2d/tile_set.h"
 #include "scene/resources/image_texture.h"
-#include "scene/resources/tile_set.h"
 
 TilesEditorUtils *TilesEditorUtils::singleton = nullptr;
 TileMapEditorPlugin *tile_map_plugin_singleton = nullptr;

modules/csg/csg_shape.h

@@ -35,7 +35,7 @@
 
 #include "scene/3d/path_3d.h"
 #include "scene/3d/visual_instance_3d.h"
-#include "scene/resources/concave_polygon_shape_3d.h"
+#include "scene/resources/3d/concave_polygon_shape_3d.h"
 
 #include "thirdparty/misc/mikktspace.h"
 

modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.cpp

@@ -32,7 +32,7 @@
 
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/resources/importer_mesh.h"
+#include "scene/resources/3d/importer_mesh.h"
 
 void GLTFDocumentExtensionConvertImporterMesh::_bind_methods() {
 }

modules/gltf/extensions/physics/gltf_physics_shape.cpp

@@ -34,13 +34,13 @@
 
 #include "core/math/convex_hull.h"
 #include "scene/3d/area_3d.h"
-#include "scene/resources/box_shape_3d.h"
-#include "scene/resources/capsule_shape_3d.h"
-#include "scene/resources/concave_polygon_shape_3d.h"
-#include "scene/resources/convex_polygon_shape_3d.h"
-#include "scene/resources/cylinder_shape_3d.h"
-#include "scene/resources/importer_mesh.h"
-#include "scene/resources/sphere_shape_3d.h"
+#include "scene/resources/3d/box_shape_3d.h"
+#include "scene/resources/3d/capsule_shape_3d.h"
+#include "scene/resources/3d/concave_polygon_shape_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
+#include "scene/resources/3d/cylinder_shape_3d.h"
+#include "scene/resources/3d/importer_mesh.h"
+#include "scene/resources/3d/sphere_shape_3d.h"
 
 void GLTFPhysicsShape::_bind_methods() {
 	ClassDB::bind_static_method("GLTFPhysicsShape", D_METHOD("from_node", "shape_node"), &GLTFPhysicsShape::from_node);

modules/gltf/gltf_document.cpp

@@ -50,9 +50,9 @@
 #include "scene/3d/light_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/multimesh_instance_3d.h"
+#include "scene/resources/3d/skin.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/portable_compressed_texture.h"
-#include "scene/resources/skin.h"
 #include "scene/resources/surface_tool.h"
 
 #ifdef TOOLS_ENABLED

modules/gltf/structures/gltf_mesh.cpp

@@ -30,7 +30,7 @@
 
 #include "gltf_mesh.h"
 
-#include "scene/resources/importer_mesh.h"
+#include "scene/resources/3d/importer_mesh.h"
 
 void GLTFMesh::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_original_name"), &GLTFMesh::get_original_name);

modules/gltf/structures/gltf_mesh.h

@@ -33,7 +33,7 @@
 
 #include "../gltf_defines.h"
 
-#include "scene/resources/importer_mesh.h"
+#include "scene/resources/3d/importer_mesh.h"
 
 class GLTFMesh : public Resource {
 	GDCLASS(GLTFMesh, Resource);

modules/gltf/structures/gltf_skin.cpp

@@ -33,7 +33,7 @@
 #include "../gltf_template_convert.h"
 
 #include "core/variant/typed_array.h"
-#include "scene/resources/skin.h"
+#include "scene/resources/3d/skin.h"
 
 void GLTFSkin::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_skin_root"), &GLTFSkin::get_skin_root);

modules/gltf/structures/gltf_skin.h

@@ -34,7 +34,7 @@
 #include "../gltf_defines.h"
 
 #include "core/io/resource.h"
-#include "scene/resources/skin.h"
+#include "scene/resources/3d/skin.h"
 
 template <typename T>
 class TypedArray;

modules/gridmap/grid_map.cpp

@@ -33,9 +33,9 @@
 #include "core/core_string_names.h"
 #include "core/io/marshalls.h"
 #include "scene/3d/light_3d.h"
-#include "scene/resources/mesh_library.h"
+#include "scene/resources/3d/mesh_library.h"
+#include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/physics_material.h"
-#include "scene/resources/primitive_meshes.h"
 #include "scene/resources/surface_tool.h"
 #include "scene/scene_string_names.h"
 #include "servers/navigation_server_3d.h"

modules/gridmap/grid_map.h

@@ -32,7 +32,7 @@
 #define GRID_MAP_H
 
 #include "scene/3d/node_3d.h"
-#include "scene/resources/mesh_library.h"
+#include "scene/resources/3d/mesh_library.h"
 #include "scene/resources/multimesh.h"
 
 //heh heh, godotsphir!! this shares no code and the design is completely different with previous projects i've done..

modules/navigation/2d/nav_mesh_generator_2d.cpp

@@ -38,13 +38,13 @@
 #include "scene/2d/physics_body_2d.h"
 #include "scene/2d/polygon_2d.h"
 #include "scene/2d/tile_map.h"
-#include "scene/resources/capsule_shape_2d.h"
-#include "scene/resources/circle_shape_2d.h"
-#include "scene/resources/concave_polygon_shape_2d.h"
-#include "scene/resources/convex_polygon_shape_2d.h"
+#include "scene/resources/2d/capsule_shape_2d.h"
+#include "scene/resources/2d/circle_shape_2d.h"
+#include "scene/resources/2d/concave_polygon_shape_2d.h"
+#include "scene/resources/2d/convex_polygon_shape_2d.h"
+#include "scene/resources/2d/rectangle_shape_2d.h"
 #include "scene/resources/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/navigation_polygon.h"
-#include "scene/resources/rectangle_shape_2d.h"
 
 #include "thirdparty/clipper2/include/clipper2/clipper.h"
 #include "thirdparty/misc/polypartition.h"

modules/navigation/3d/nav_mesh_generator_3d.cpp

@@ -38,18 +38,18 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/multimesh_instance_3d.h"
 #include "scene/3d/physics_body_3d.h"
-#include "scene/resources/box_shape_3d.h"
-#include "scene/resources/capsule_shape_3d.h"
-#include "scene/resources/concave_polygon_shape_3d.h"
-#include "scene/resources/convex_polygon_shape_3d.h"
-#include "scene/resources/cylinder_shape_3d.h"
-#include "scene/resources/height_map_shape_3d.h"
+#include "scene/resources/3d/box_shape_3d.h"
+#include "scene/resources/3d/capsule_shape_3d.h"
+#include "scene/resources/3d/concave_polygon_shape_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
+#include "scene/resources/3d/cylinder_shape_3d.h"
+#include "scene/resources/3d/height_map_shape_3d.h"
+#include "scene/resources/3d/primitive_meshes.h"
+#include "scene/resources/3d/shape_3d.h"
+#include "scene/resources/3d/sphere_shape_3d.h"
+#include "scene/resources/3d/world_boundary_shape_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
-#include "scene/resources/primitive_meshes.h"
-#include "scene/resources/shape_3d.h"
-#include "scene/resources/sphere_shape_3d.h"
-#include "scene/resources/world_boundary_shape_3d.h"
 
 #include "modules/modules_enabled.gen.h" // For csg, gridmap.
 

scene/2d/collision_object_2d.h

@@ -33,7 +33,7 @@
 
 #include "scene/2d/node_2d.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
 #include "servers/physics_server_2d.h"
 
 class CollisionObject2D : public Node2D {

scene/2d/collision_polygon_2d.cpp

@@ -33,8 +33,8 @@
 #include "collision_object_2d.h"
 #include "core/math/geometry_2d.h"
 #include "scene/2d/area_2d.h"
-#include "scene/resources/concave_polygon_shape_2d.h"
-#include "scene/resources/convex_polygon_shape_2d.h"
+#include "scene/resources/2d/concave_polygon_shape_2d.h"
+#include "scene/resources/2d/convex_polygon_shape_2d.h"
 
 #include "thirdparty/misc/polypartition.h"
 

scene/2d/collision_shape_2d.cpp

@@ -32,8 +32,8 @@
 
 #include "collision_object_2d.h"
 #include "scene/2d/area_2d.h"
-#include "scene/resources/concave_polygon_shape_2d.h"
-#include "scene/resources/convex_polygon_shape_2d.h"
+#include "scene/resources/2d/concave_polygon_shape_2d.h"
+#include "scene/resources/2d/convex_polygon_shape_2d.h"
 
 void CollisionShape2D::_shape_changed() {
 	queue_redraw();

scene/2d/collision_shape_2d.h

@@ -32,7 +32,7 @@
 #define COLLISION_SHAPE_2D_H
 
 #include "scene/2d/node_2d.h"
-#include "scene/resources/shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
 
 class CollisionObject2D;
 

scene/2d/shape_cast_2d.cpp

@@ -33,7 +33,7 @@
 #include "core/config/engine.h"
 #include "scene/2d/collision_object_2d.h"
 #include "scene/2d/physics_body_2d.h"
-#include "scene/resources/circle_shape_2d.h"
+#include "scene/resources/2d/circle_shape_2d.h"
 #include "servers/physics_2d/godot_physics_server_2d.h"
 
 void ShapeCast2D::set_target_position(const Vector2 &p_point) {

scene/2d/shape_cast_2d.h

@@ -32,7 +32,7 @@
 #define SHAPE_CAST_2D_H
 
 #include "scene/2d/node_2d.h"
-#include "scene/resources/shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
 #include "scene/resources/world_2d.h"
 
 class CollisionObject2D;

scene/2d/skeleton_2d.h

@@ -32,7 +32,7 @@
 #define SKELETON_2D_H
 
 #include "scene/2d/node_2d.h"
-#include "scene/resources/skeleton_modification_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
 
 class Skeleton2D;
 

scene/2d/tile_map.h

@@ -32,7 +32,7 @@
 #define TILE_MAP_H
 
 #include "scene/2d/tile_map_layer_group.h"
-#include "scene/resources/tile_set.h"
+#include "scene/resources/2d/tile_set.h"
 
 class Control;
 class TileMapLayer;

scene/2d/tile_map_layer.h

@@ -32,7 +32,7 @@
 #define TILE_MAP_LAYER_H
 
 #include "scene/2d/tile_map.h"
-#include "scene/resources/tile_set.h"
+#include "scene/resources/2d/tile_set.h"
 
 class TileSetAtlasSource;
 

scene/2d/tile_map_layer_group.cpp

@@ -32,7 +32,7 @@
 
 #include "core/core_string_names.h"
 #include "scene/2d/tile_map_layer.h"
-#include "scene/resources/tile_set.h"
+#include "scene/resources/2d/tile_set.h"
 
 #ifdef TOOLS_ENABLED
 

scene/2d/touch_screen_button.h

@@ -32,8 +32,8 @@
 #define TOUCH_SCREEN_BUTTON_H
 
 #include "scene/2d/node_2d.h"
+#include "scene/resources/2d/rectangle_shape_2d.h"
 #include "scene/resources/bit_map.h"
-#include "scene/resources/rectangle_shape_2d.h"
 #include "scene/resources/texture.h"
 
 class TouchScreenButton : public Node2D {

scene/3d/collision_object_3d.cpp

@@ -30,7 +30,7 @@
 
 #include "collision_object_3d.h"
 
-#include "scene/resources/shape_3d.h"
+#include "scene/resources/3d/shape_3d.h"
 #include "scene/scene_string_names.h"
 
 void CollisionObject3D::_notification(int p_what) {

scene/3d/collision_polygon_3d.cpp

@@ -32,7 +32,7 @@
 
 #include "collision_object_3d.h"
 #include "core/math/geometry_2d.h"
-#include "scene/resources/convex_polygon_shape_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
 
 void CollisionPolygon3D::_build_polygon() {
 	if (!collision_object) {

scene/3d/collision_polygon_3d.h

@@ -32,7 +32,7 @@
 #define COLLISION_POLYGON_3D_H
 
 #include "scene/3d/node_3d.h"
-#include "scene/resources/shape_3d.h"
+#include "scene/resources/3d/shape_3d.h"
 
 class CollisionObject3D;
 class CollisionPolygon3D : public Node3D {

scene/3d/collision_shape_3d.cpp

@@ -32,9 +32,9 @@
 
 #include "mesh_instance_3d.h"
 #include "physics_body_3d.h"
-#include "scene/resources/concave_polygon_shape_3d.h"
-#include "scene/resources/convex_polygon_shape_3d.h"
-#include "scene/resources/world_boundary_shape_3d.h"
+#include "scene/resources/3d/concave_polygon_shape_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
+#include "scene/resources/3d/world_boundary_shape_3d.h"
 #include "vehicle_body_3d.h"
 
 void CollisionShape3D::make_convex_from_siblings() {

scene/3d/collision_shape_3d.h

@@ -32,7 +32,7 @@
 #define COLLISION_SHAPE_3D_H
 
 #include "scene/3d/node_3d.h"
-#include "scene/resources/shape_3d.h"
+#include "scene/resources/3d/shape_3d.h"
 
 class CollisionObject3D;
 class CollisionShape3D : public Node3D {

scene/3d/gpu_particles_3d.h

@@ -32,7 +32,7 @@
 #define GPU_PARTICLES_3D_H
 
 #include "scene/3d/visual_instance_3d.h"
-#include "scene/resources/skin.h"
+#include "scene/resources/3d/skin.h"
 
 class GPUParticles3D : public GeometryInstance3D {
 private:

scene/3d/importer_mesh_instance_3d.cpp

@@ -30,7 +30,7 @@
 
 #include "importer_mesh_instance_3d.h"
 
-#include "scene/resources/importer_mesh.h"
+#include "scene/resources/3d/importer_mesh.h"
 
 void ImporterMeshInstance3D::set_mesh(const Ref<ImporterMesh> &p_mesh) {
 	mesh = p_mesh;

scene/3d/importer_mesh_instance_3d.h

@@ -33,8 +33,8 @@
 
 #include "scene/3d/node_3d.h"
 #include "scene/3d/visual_instance_3d.h"
+#include "scene/resources/3d/skin.h"
 #include "scene/resources/immediate_mesh.h"
-#include "scene/resources/skin.h"
 
 class ImporterMesh;
 

scene/3d/mesh_instance_3d.cpp

@@ -32,8 +32,8 @@
 
 #include "collision_shape_3d.h"
 #include "physics_body_3d.h"
-#include "scene/resources/concave_polygon_shape_3d.h"
-#include "scene/resources/convex_polygon_shape_3d.h"
+#include "scene/resources/3d/concave_polygon_shape_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
 
 bool MeshInstance3D::_set(const StringName &p_name, const Variant &p_value) {
 	//this is not _too_ bad performance wise, really. it only arrives here if the property was not set anywhere else.

scene/3d/node_3d.h

@@ -32,7 +32,7 @@
 #define NODE_3D_H
 
 #include "scene/main/node.h"
-#include "scene/resources/world_3d.h"
+#include "scene/resources/3d/world_3d.h"
 
 class Node3DGizmo : public RefCounted {
 	GDCLASS(Node3DGizmo, RefCounted);

scene/3d/occluder_instance_3d.cpp

@@ -36,7 +36,7 @@
 #include "core/math/triangulate.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/resources/importer_mesh.h"
+#include "scene/resources/3d/importer_mesh.h"
 #include "scene/resources/surface_tool.h"
 
 #ifdef TOOLS_ENABLED

scene/3d/shape_cast_3d.cpp

@@ -32,7 +32,7 @@
 
 #include "scene/3d/collision_object_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/resources/concave_polygon_shape_3d.h"
+#include "scene/resources/3d/concave_polygon_shape_3d.h"
 
 void ShapeCast3D::_notification(int p_what) {
 	switch (p_what) {

scene/3d/shape_cast_3d.h

@@ -32,7 +32,7 @@
 #define SHAPE_CAST_3D_H
 
 #include "scene/3d/node_3d.h"
-#include "scene/resources/shape_3d.h"
+#include "scene/resources/3d/shape_3d.h"
 
 class CollisionObject3D;
 

scene/3d/skeleton_3d.h

@@ -32,7 +32,7 @@
 #define SKELETON_3D_H
 
 #include "scene/3d/node_3d.h"
-#include "scene/resources/skin.h"
+#include "scene/resources/3d/skin.h"
 
 typedef int BoneId;
 

scene/3d/spring_arm_3d.cpp

@@ -31,7 +31,7 @@
 #include "spring_arm_3d.h"
 
 #include "scene/3d/camera_3d.h"
-#include "scene/resources/shape_3d.h"
+#include "scene/resources/3d/shape_3d.h"
 
 void SpringArm3D::_notification(int p_what) {
 	switch (p_what) {

scene/main/scene_tree.cpp

@@ -55,12 +55,12 @@
 #include "scene/resources/mesh.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/world_2d.h"
-#include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"
 #include "servers/display_server.h"
 #include "servers/navigation_server_3d.h"
 #include "servers/physics_server_2d.h"
 #ifndef _3D_DISABLED
+#include "scene/resources/3d/world_3d.h"
 #include "servers/physics_server_3d.h"
 #endif // _3D_DISABLED
 #include "window.h"

scene/register_scene_types.cpp

@@ -139,6 +139,25 @@
 #include "scene/main/timer.h"
 #include "scene/main/viewport.h"
 #include "scene/main/window.h"
+#include "scene/resources/2d/capsule_shape_2d.h"
+#include "scene/resources/2d/circle_shape_2d.h"
+#include "scene/resources/2d/concave_polygon_shape_2d.h"
+#include "scene/resources/2d/convex_polygon_shape_2d.h"
+#include "scene/resources/2d/polygon_path_finder.h"
+#include "scene/resources/2d/rectangle_shape_2d.h"
+#include "scene/resources/2d/segment_shape_2d.h"
+#include "scene/resources/2d/separation_ray_shape_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_stack_2d.h"
+#include "scene/resources/2d/tile_set.h"
+#include "scene/resources/2d/world_boundary_shape_2d.h"
 #include "scene/resources/animated_texture.h"
 #include "scene/resources/animation_library.h"
 #include "scene/resources/atlas_texture.h"
@@ -148,12 +167,8 @@
 #include "scene/resources/bone_map.h"
 #include "scene/resources/camera_attributes.h"
 #include "scene/resources/camera_texture.h"
-#include "scene/resources/capsule_shape_2d.h"
-#include "scene/resources/circle_shape_2d.h"
 #include "scene/resources/compositor.h"
 #include "scene/resources/compressed_texture.h"
-#include "scene/resources/concave_polygon_shape_2d.h"
-#include "scene/resources/convex_polygon_shape_2d.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/environment.h"
 #include "scene/resources/font.h"
@@ -174,25 +189,11 @@
 #include "scene/resources/particle_process_material.h"
 #include "scene/resources/physics_material.h"
 #include "scene/resources/placeholder_textures.h"
-#include "scene/resources/polygon_path_finder.h"
 #include "scene/resources/portable_compressed_texture.h"
-#include "scene/resources/rectangle_shape_2d.h"
 #include "scene/resources/resource_format_text.h"
-#include "scene/resources/segment_shape_2d.h"
-#include "scene/resources/separation_ray_shape_2d.h"
 #include "scene/resources/shader_include.h"
-#include "scene/resources/skeleton_modification_2d.h"
-#include "scene/resources/skeleton_modification_2d_ccdik.h"
-#include "scene/resources/skeleton_modification_2d_fabrik.h"
-#include "scene/resources/skeleton_modification_2d_jiggle.h"
-#include "scene/resources/skeleton_modification_2d_lookat.h"
-#include "scene/resources/skeleton_modification_2d_physicalbones.h"
-#include "scene/resources/skeleton_modification_2d_stackholder.h"
-#include "scene/resources/skeleton_modification_2d_twoboneik.h"
-#include "scene/resources/skeleton_modification_stack_2d.h"
 #include "scene/resources/skeleton_profile.h"
 #include "scene/resources/sky.h"
-#include "scene/resources/sky_material.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/resources/style_box_line.h"
@@ -205,14 +206,12 @@
 #include "scene/resources/texture.h"
 #include "scene/resources/texture_rd.h"
 #include "scene/resources/theme.h"
-#include "scene/resources/tile_set.h"
 #include "scene/resources/video_stream.h"
 #include "scene/resources/visual_shader.h"
 #include "scene/resources/visual_shader_nodes.h"
 #include "scene/resources/visual_shader_particle_nodes.h"
 #include "scene/resources/visual_shader_sdf_nodes.h"
 #include "scene/resources/world_2d.h"
-#include "scene/resources/world_boundary_shape_2d.h"
 #include "scene/scene_string_names.h"
 #include "scene/theme/theme_db.h"
 
@@ -265,20 +264,21 @@
 #include "scene/3d/xr_hand_modifier_3d.h"
 #include "scene/3d/xr_nodes.h"
 #include "scene/animation/root_motion_view.h"
-#include "scene/resources/box_shape_3d.h"
-#include "scene/resources/capsule_shape_3d.h"
-#include "scene/resources/concave_polygon_shape_3d.h"
-#include "scene/resources/convex_polygon_shape_3d.h"
-#include "scene/resources/cylinder_shape_3d.h"
-#include "scene/resources/fog_material.h"
-#include "scene/resources/height_map_shape_3d.h"
-#include "scene/resources/importer_mesh.h"
-#include "scene/resources/mesh_library.h"
-#include "scene/resources/primitive_meshes.h"
-#include "scene/resources/separation_ray_shape_3d.h"
-#include "scene/resources/sphere_shape_3d.h"
-#include "scene/resources/world_3d.h"
-#include "scene/resources/world_boundary_shape_3d.h"
+#include "scene/resources/3d/box_shape_3d.h"
+#include "scene/resources/3d/capsule_shape_3d.h"
+#include "scene/resources/3d/concave_polygon_shape_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
+#include "scene/resources/3d/cylinder_shape_3d.h"
+#include "scene/resources/3d/fog_material.h"
+#include "scene/resources/3d/height_map_shape_3d.h"
+#include "scene/resources/3d/importer_mesh.h"
+#include "scene/resources/3d/mesh_library.h"
+#include "scene/resources/3d/primitive_meshes.h"
+#include "scene/resources/3d/separation_ray_shape_3d.h"
+#include "scene/resources/3d/sky_material.h"
+#include "scene/resources/3d/sphere_shape_3d.h"
+#include "scene/resources/3d/world_3d.h"
+#include "scene/resources/3d/world_boundary_shape_3d.h"
 #endif // _3D_DISABLED
 
 static Ref<ResourceFormatSaverText> resource_saver_text;

scene/resources/2d/SCsub

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+Import("env")
+
+env.add_source_files(env.scene_sources, "*.cpp")
+env.add_source_files(env.scene_sources, "skeleton/*.cpp")

scene/resources/capsule_shape_2d.h → scene/resources/2d/capsule_shape_2d.h

@@ -31,7 +31,7 @@
 #ifndef CAPSULE_SHAPE_2D_H
 #define CAPSULE_SHAPE_2D_H
 
-#include "scene/resources/shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
 
 class CapsuleShape2D : public Shape2D {
 	GDCLASS(CapsuleShape2D, Shape2D);

scene/resources/circle_shape_2d.h → scene/resources/2d/circle_shape_2d.h

@@ -31,7 +31,7 @@
 #ifndef CIRCLE_SHAPE_2D_H
 #define CIRCLE_SHAPE_2D_H
 
-#include "scene/resources/shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
 
 class CircleShape2D : public Shape2D {
 	GDCLASS(CircleShape2D, Shape2D);

scene/resources/concave_polygon_shape_2d.h → scene/resources/2d/concave_polygon_shape_2d.h

@@ -31,7 +31,7 @@
 #ifndef CONCAVE_POLYGON_SHAPE_2D_H
 #define CONCAVE_POLYGON_SHAPE_2D_H
 
-#include "scene/resources/shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
 
 class ConcavePolygonShape2D : public Shape2D {
 	GDCLASS(ConcavePolygonShape2D, Shape2D);

scene/resources/convex_polygon_shape_2d.h → scene/resources/2d/convex_polygon_shape_2d.h

@@ -31,7 +31,7 @@
 #ifndef CONVEX_POLYGON_SHAPE_2D_H
 #define CONVEX_POLYGON_SHAPE_2D_H
 
-#include "scene/resources/shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
 
 class ConvexPolygonShape2D : public Shape2D {
 	GDCLASS(ConvexPolygonShape2D, Shape2D);

scene/resources/rectangle_shape_2d.h → scene/resources/2d/rectangle_shape_2d.h

@@ -31,7 +31,7 @@
 #ifndef RECTANGLE_SHAPE_2D_H
 #define RECTANGLE_SHAPE_2D_H
 
-#include "scene/resources/shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
 
 class RectangleShape2D : public Shape2D {
 	GDCLASS(RectangleShape2D, Shape2D);

scene/resources/segment_shape_2d.h → scene/resources/2d/segment_shape_2d.h

@@ -31,7 +31,7 @@
 #ifndef SEGMENT_SHAPE_2D_H
 #define SEGMENT_SHAPE_2D_H
 
-#include "scene/resources/shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
 
 class SegmentShape2D : public Shape2D {
 	GDCLASS(SegmentShape2D, Shape2D);

scene/resources/separation_ray_shape_2d.h → scene/resources/2d/separation_ray_shape_2d.h

@@ -31,7 +31,7 @@
 #ifndef SEPARATION_RAY_SHAPE_2D_H
 #define SEPARATION_RAY_SHAPE_2D_H
 
-#include "scene/resources/shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
 
 class SeparationRayShape2D : public Shape2D {
 	GDCLASS(SeparationRayShape2D, Shape2D);

scene/resources/skeleton_modification_2d.h → scene/resources/2d/skeleton/skeleton_modification_2d.h

@@ -32,7 +32,7 @@
 #define SKELETON_MODIFICATION_2D_H
 
 #include "scene/2d/skeleton_2d.h"
-#include "scene/resources/skeleton_modification_stack_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_stack_2d.h"
 
 ///////////////////////////////////////
 // SkeletonModification2D

scene/resources/skeleton_modification_2d_ccdik.h → scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h

@@ -32,7 +32,7 @@
 #define SKELETON_MODIFICATION_2D_CCDIK_H
 
 #include "scene/2d/skeleton_2d.h"
-#include "scene/resources/skeleton_modification_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
 
 ///////////////////////////////////////
 // SkeletonModification2DCCDIK

scene/resources/skeleton_modification_2d_fabrik.h → scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h

@@ -32,7 +32,7 @@
 #define SKELETON_MODIFICATION_2D_FABRIK_H
 
 #include "scene/2d/skeleton_2d.h"
-#include "scene/resources/skeleton_modification_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
 
 ///////////////////////////////////////
 // SkeletonModification2DFABRIK

scene/resources/skeleton_modification_2d_jiggle.h → scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h

@@ -32,7 +32,7 @@
 #define SKELETON_MODIFICATION_2D_JIGGLE_H
 
 #include "scene/2d/skeleton_2d.h"
-#include "scene/resources/skeleton_modification_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
 
 ///////////////////////////////////////
 // SkeletonModification2DJIGGLE

scene/resources/skeleton_modification_2d_lookat.h → scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h

@@ -32,7 +32,7 @@
 #define SKELETON_MODIFICATION_2D_LOOKAT_H
 
 #include "scene/2d/skeleton_2d.h"
-#include "scene/resources/skeleton_modification_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
 
 ///////////////////////////////////////
 // SkeletonModification2DLookAt

scene/resources/skeleton_modification_2d_physicalbones.h → scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h

@@ -32,7 +32,7 @@
 #define SKELETON_MODIFICATION_2D_PHYSICALBONES_H
 
 #include "scene/2d/skeleton_2d.h"
-#include "scene/resources/skeleton_modification_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
 
 ///////////////////////////////////////
 // SkeletonModification2DJIGGLE

scene/resources/skeleton_modification_2d_stackholder.h → scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h

@@ -32,7 +32,7 @@
 #define SKELETON_MODIFICATION_2D_STACKHOLDER_H
 
 #include "scene/2d/skeleton_2d.h"
-#include "scene/resources/skeleton_modification_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
 
 ///////////////////////////////////////
 // SkeletonModification2DJIGGLE

scene/resources/skeleton_modification_2d_twoboneik.h → scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h

@@ -32,7 +32,7 @@
 #define SKELETON_MODIFICATION_2D_TWOBONEIK_H
 
 #include "scene/2d/skeleton_2d.h"
-#include "scene/resources/skeleton_modification_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
 
 ///////////////////////////////////////
 // SkeletonModification2DJIGGLE

scene/resources/skeleton_modification_stack_2d.h → scene/resources/2d/skeleton/skeleton_modification_stack_2d.h

@@ -32,7 +32,7 @@
 #define SKELETON_MODIFICATION_STACK_2D_H
 
 #include "scene/2d/skeleton_2d.h"
-#include "scene/resources/skeleton_modification_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
 
 ///////////////////////////////////////
 // SkeletonModificationStack2D