Move 2D-only resources to their own folder

Mickeon · Feb 26, 2024 · 1cb531d · 1cb531d
1 parent 8eb34cb
commit 1cb531d
Show file tree

Hide file tree

Showing 65 changed files with 79 additions and 73 deletions.
diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/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() {

diff --git a/editor/plugins/tiles/atlas_merging_dialog.h b/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;

diff --git a/editor/plugins/tiles/tile_atlas_view.h b/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;
 

diff --git a/editor/plugins/tiles/tile_set_atlas_source_editor.h b/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;

diff --git a/editor/plugins/tiles/tile_set_editor.h b/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"

diff --git a/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h b/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;

diff --git a/editor/plugins/tiles/tiles_editor_plugin.cpp b/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;

diff --git a/modules/navigation/2d/nav_mesh_generator_2d.cpp b/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"

diff --git a/scene/2d/collision_object_2d.h b/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 {

diff --git a/scene/2d/collision_polygon_2d.cpp b/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"
 

diff --git a/scene/2d/collision_shape_2d.cpp b/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();

diff --git a/scene/2d/collision_shape_2d.h b/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;
 

diff --git a/scene/2d/shape_cast_2d.cpp b/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) {

diff --git a/scene/2d/shape_cast_2d.h b/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;

diff --git a/scene/2d/skeleton_2d.h b/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;
 

diff --git a/scene/2d/tile_map.h b/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;

diff --git a/scene/2d/tile_map_layer.h b/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;
 

diff --git a/scene/2d/tile_map_layer_group.cpp b/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
 

diff --git a/scene/2d/touch_screen_button.h b/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 {

diff --git a/scene/register_scene_types.cpp b/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,22 +189,9 @@
 #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"
@@ -205,14 +207,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"
 

diff --git a/scene/resources/2d/SCsub b/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")
diff --git a/scene/resources/capsule_shape_2d.cpp → scene/resources/2d/capsule_shape_2d.cpp b/scene/resources/capsule_shape_2d.cpp → scene/resources/2d/capsule_shape_2d.cpp
diff --git a/scene/resources/capsule_shape_2d.h → scene/resources/2d/capsule_shape_2d.h b/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);

diff --git a/scene/resources/circle_shape_2d.cpp → scene/resources/2d/circle_shape_2d.cpp b/scene/resources/circle_shape_2d.cpp → scene/resources/2d/circle_shape_2d.cpp
diff --git a/scene/resources/circle_shape_2d.h → scene/resources/2d/circle_shape_2d.h b/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);

diff --git a/scene/resources/concave_polygon_shape_2d.cpp → ...resources/2d/concave_polygon_shape_2d.cpp b/scene/resources/concave_polygon_shape_2d.cpp → ...resources/2d/concave_polygon_shape_2d.cpp
diff --git a/scene/resources/concave_polygon_shape_2d.h → ...e/resources/2d/concave_polygon_shape_2d.h b/scene/resources/concave_polygon_shape_2d.h → ...e/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);

diff --git a/scene/resources/convex_polygon_shape_2d.cpp → .../resources/2d/convex_polygon_shape_2d.cpp b/scene/resources/convex_polygon_shape_2d.cpp → .../resources/2d/convex_polygon_shape_2d.cpp
diff --git a/scene/resources/convex_polygon_shape_2d.h → scene/resources/2d/convex_polygon_shape_2d.h b/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);

diff --git a/scene/resources/polygon_path_finder.cpp → scene/resources/2d/polygon_path_finder.cpp b/scene/resources/polygon_path_finder.cpp → scene/resources/2d/polygon_path_finder.cpp
diff --git a/scene/resources/polygon_path_finder.h → scene/resources/2d/polygon_path_finder.h b/scene/resources/polygon_path_finder.h → scene/resources/2d/polygon_path_finder.h
diff --git a/scene/resources/rectangle_shape_2d.cpp → scene/resources/2d/rectangle_shape_2d.cpp b/scene/resources/rectangle_shape_2d.cpp → scene/resources/2d/rectangle_shape_2d.cpp
diff --git a/scene/resources/rectangle_shape_2d.h → scene/resources/2d/rectangle_shape_2d.h b/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);

diff --git a/scene/resources/segment_shape_2d.cpp → scene/resources/2d/segment_shape_2d.cpp b/scene/resources/segment_shape_2d.cpp → scene/resources/2d/segment_shape_2d.cpp
diff --git a/scene/resources/segment_shape_2d.h → scene/resources/2d/segment_shape_2d.h b/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);

diff --git a/scene/resources/separation_ray_shape_2d.cpp → .../resources/2d/separation_ray_shape_2d.cpp b/scene/resources/separation_ray_shape_2d.cpp → .../resources/2d/separation_ray_shape_2d.cpp
diff --git a/scene/resources/separation_ray_shape_2d.h → scene/resources/2d/separation_ray_shape_2d.h b/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);

diff --git a/scene/resources/shape_2d.cpp → scene/resources/2d/shape_2d.cpp b/scene/resources/shape_2d.cpp → scene/resources/2d/shape_2d.cpp
diff --git a/scene/resources/shape_2d.h → scene/resources/2d/shape_2d.h b/scene/resources/shape_2d.h → scene/resources/2d/shape_2d.h
diff --git a/scene/resources/skeleton_modification_2d.cpp → .../2d/skeleton/skeleton_modification_2d.cpp b/scene/resources/skeleton_modification_2d.cpp → .../2d/skeleton/skeleton_modification_2d.cpp
diff --git a/scene/resources/skeleton_modification_2d.h → ...es/2d/skeleton/skeleton_modification_2d.h b/scene/resources/skeleton_modification_2d.h → ...es/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

diff --git a/...ources/skeleton_modification_2d_ccdik.cpp → ...eleton/skeleton_modification_2d_ccdik.cpp b/...ources/skeleton_modification_2d_ccdik.cpp → ...eleton/skeleton_modification_2d_ccdik.cpp
diff --git a/...esources/skeleton_modification_2d_ccdik.h → ...skeleton/skeleton_modification_2d_ccdik.h b/...esources/skeleton_modification_2d_ccdik.h → ...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

diff --git a/...urces/skeleton_modification_2d_fabrik.cpp → ...leton/skeleton_modification_2d_fabrik.cpp b/...urces/skeleton_modification_2d_fabrik.cpp → ...leton/skeleton_modification_2d_fabrik.cpp
diff --git a/...sources/skeleton_modification_2d_fabrik.h → ...keleton/skeleton_modification_2d_fabrik.h b/...sources/skeleton_modification_2d_fabrik.h → ...keleton/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

diff --git a/...urces/skeleton_modification_2d_jiggle.cpp → ...leton/skeleton_modification_2d_jiggle.cpp b/...urces/skeleton_modification_2d_jiggle.cpp → ...leton/skeleton_modification_2d_jiggle.cpp
diff --git a/...sources/skeleton_modification_2d_jiggle.h → ...keleton/skeleton_modification_2d_jiggle.h b/...sources/skeleton_modification_2d_jiggle.h → ...keleton/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

diff --git a/...urces/skeleton_modification_2d_lookat.cpp → ...leton/skeleton_modification_2d_lookat.cpp b/...urces/skeleton_modification_2d_lookat.cpp → ...leton/skeleton_modification_2d_lookat.cpp
diff --git a/...sources/skeleton_modification_2d_lookat.h → ...keleton/skeleton_modification_2d_lookat.h b/...sources/skeleton_modification_2d_lookat.h → ...keleton/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

diff --git a/...keleton_modification_2d_physicalbones.cpp → ...keleton_modification_2d_physicalbones.cpp b/...keleton_modification_2d_physicalbones.cpp → ...keleton_modification_2d_physicalbones.cpp