From 1cb531ddb6fedb5bed432eeaa17793a9e07f61ac Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Tue, 16 Mar 2021 02:27:53 -0400 Subject: [PATCH 1/2] Move 2D-only resources to their own folder --- .../collision_shape_2d_editor_plugin.cpp | 16 ++++---- editor/plugins/tiles/atlas_merging_dialog.h | 2 +- editor/plugins/tiles/tile_atlas_view.h | 2 +- .../tiles/tile_set_atlas_source_editor.h | 2 +- editor/plugins/tiles/tile_set_editor.h | 2 +- ...tile_set_scenes_collection_source_editor.h | 2 +- editor/plugins/tiles/tiles_editor_plugin.cpp | 2 +- .../navigation/2d/nav_mesh_generator_2d.cpp | 10 ++--- scene/2d/collision_object_2d.h | 2 +- scene/2d/collision_polygon_2d.cpp | 4 +- scene/2d/collision_shape_2d.cpp | 4 +- scene/2d/collision_shape_2d.h | 2 +- scene/2d/shape_cast_2d.cpp | 2 +- scene/2d/shape_cast_2d.h | 2 +- scene/2d/skeleton_2d.h | 2 +- scene/2d/tile_map.h | 2 +- scene/2d/tile_map_layer.h | 2 +- scene/2d/tile_map_layer_group.cpp | 2 +- scene/2d/touch_screen_button.h | 2 +- scene/register_scene_types.cpp | 38 +++++++++---------- scene/resources/2d/SCsub | 6 +++ scene/resources/{ => 2d}/capsule_shape_2d.cpp | 0 scene/resources/{ => 2d}/capsule_shape_2d.h | 2 +- scene/resources/{ => 2d}/circle_shape_2d.cpp | 0 scene/resources/{ => 2d}/circle_shape_2d.h | 2 +- .../{ => 2d}/concave_polygon_shape_2d.cpp | 0 .../{ => 2d}/concave_polygon_shape_2d.h | 2 +- .../{ => 2d}/convex_polygon_shape_2d.cpp | 0 .../{ => 2d}/convex_polygon_shape_2d.h | 2 +- .../{ => 2d}/polygon_path_finder.cpp | 0 .../resources/{ => 2d}/polygon_path_finder.h | 0 .../resources/{ => 2d}/rectangle_shape_2d.cpp | 0 scene/resources/{ => 2d}/rectangle_shape_2d.h | 2 +- scene/resources/{ => 2d}/segment_shape_2d.cpp | 0 scene/resources/{ => 2d}/segment_shape_2d.h | 2 +- .../{ => 2d}/separation_ray_shape_2d.cpp | 0 .../{ => 2d}/separation_ray_shape_2d.h | 2 +- scene/resources/{ => 2d}/shape_2d.cpp | 0 scene/resources/{ => 2d}/shape_2d.h | 0 .../skeleton}/skeleton_modification_2d.cpp | 0 .../skeleton}/skeleton_modification_2d.h | 2 +- .../skeleton_modification_2d_ccdik.cpp | 0 .../skeleton_modification_2d_ccdik.h | 2 +- .../skeleton_modification_2d_fabrik.cpp | 0 .../skeleton_modification_2d_fabrik.h | 2 +- .../skeleton_modification_2d_jiggle.cpp | 0 .../skeleton_modification_2d_jiggle.h | 2 +- .../skeleton_modification_2d_lookat.cpp | 0 .../skeleton_modification_2d_lookat.h | 2 +- ...skeleton_modification_2d_physicalbones.cpp | 0 .../skeleton_modification_2d_physicalbones.h | 2 +- .../skeleton_modification_2d_stackholder.cpp | 0 .../skeleton_modification_2d_stackholder.h | 2 +- .../skeleton_modification_2d_twoboneik.cpp | 0 .../skeleton_modification_2d_twoboneik.h | 2 +- .../skeleton_modification_stack_2d.cpp | 0 .../skeleton_modification_stack_2d.h | 2 +- scene/resources/{ => 2d}/tile_set.compat.inc | 0 scene/resources/{ => 2d}/tile_set.cpp | 1 - scene/resources/{ => 2d}/tile_set.h | 4 +- .../{ => 2d}/world_boundary_shape_2d.cpp | 0 .../{ => 2d}/world_boundary_shape_2d.h | 2 +- scene/resources/SCsub | 2 + scu_builders.py | 1 + tests/scene/test_viewport.h | 2 +- 65 files changed, 79 insertions(+), 73 deletions(-) create mode 100644 scene/resources/2d/SCsub rename scene/resources/{ => 2d}/capsule_shape_2d.cpp (100%) rename scene/resources/{ => 2d}/capsule_shape_2d.h (98%) rename scene/resources/{ => 2d}/circle_shape_2d.cpp (100%) rename scene/resources/{ => 2d}/circle_shape_2d.h (98%) rename scene/resources/{ => 2d}/concave_polygon_shape_2d.cpp (100%) rename scene/resources/{ => 2d}/concave_polygon_shape_2d.h (98%) rename scene/resources/{ => 2d}/convex_polygon_shape_2d.cpp (100%) rename scene/resources/{ => 2d}/convex_polygon_shape_2d.h (98%) rename scene/resources/{ => 2d}/polygon_path_finder.cpp (100%) rename scene/resources/{ => 2d}/polygon_path_finder.h (100%) rename scene/resources/{ => 2d}/rectangle_shape_2d.cpp (100%) rename scene/resources/{ => 2d}/rectangle_shape_2d.h (98%) rename scene/resources/{ => 2d}/segment_shape_2d.cpp (100%) rename scene/resources/{ => 2d}/segment_shape_2d.h (98%) rename scene/resources/{ => 2d}/separation_ray_shape_2d.cpp (100%) rename scene/resources/{ => 2d}/separation_ray_shape_2d.h (98%) rename scene/resources/{ => 2d}/shape_2d.cpp (100%) rename scene/resources/{ => 2d}/shape_2d.h (100%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d.cpp (100%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d.h (98%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_ccdik.cpp (100%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_ccdik.h (98%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_fabrik.cpp (100%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_fabrik.h (98%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_jiggle.cpp (100%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_jiggle.h (98%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_lookat.cpp (100%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_lookat.h (98%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_physicalbones.cpp (100%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_physicalbones.h (98%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_stackholder.cpp (100%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_stackholder.h (98%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_twoboneik.cpp (100%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_2d_twoboneik.h (98%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_stack_2d.cpp (100%) rename scene/resources/{ => 2d/skeleton}/skeleton_modification_stack_2d.h (98%) rename scene/resources/{ => 2d}/tile_set.compat.inc (100%) rename scene/resources/{ => 2d}/tile_set.cpp (99%) rename scene/resources/{ => 2d}/tile_set.h (99%) rename scene/resources/{ => 2d}/world_boundary_shape_2d.cpp (100%) rename scene/resources/{ => 2d}/world_boundary_shape_2d.h (98%) diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp index 31918586576..12dde461932 100644 --- 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 index 324cc824902..2517db2ccd4 100644 --- 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 index e5b088af613..e5b4863b05f 100644 --- 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 index b98705baf17..322de810459 100644 --- 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 index 755b940db2a..68ab046ecff 100644 --- 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 index 82de063a076..5527685b242 100644 --- 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 index 46bc072c180..e7bf812a6c7 100644 --- 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 index 836dee81787..9fdfb208423 100644 --- 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 index 780793f289b..2c8534665ca 100644 --- 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 index d2f71eca9d6..3bc5bce8f0d 100644 --- 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 index ee413c7bc2d..5539e491354 100644 --- 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 index 3e13dd698c1..65436f1539e 100644 --- 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 index 90d80d75490..38e3b3180b8 100644 --- 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 index a577c351fd7..6b8fd5b798e 100644 --- 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 index 6a36a315529..ad6a47bf431 100644 --- 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 index 16750625e5c..c9844f29af7 100644 --- 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 index ac03f3155f9..5a0c51d7e5f 100644 --- 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 index ac0de380a3b..c5965344745 100644 --- 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 index c7dc0a323ed..4467604e2b2 100644 --- 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 index 035c6c0695b..77a331f52cf 100644 --- 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 new file mode 100644 index 00000000000..fdf20e0bde3 --- /dev/null +++ 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 b/scene/resources/2d/capsule_shape_2d.cpp similarity index 100% rename from scene/resources/capsule_shape_2d.cpp rename to scene/resources/2d/capsule_shape_2d.cpp diff --git a/scene/resources/capsule_shape_2d.h b/scene/resources/2d/capsule_shape_2d.h similarity index 98% rename from scene/resources/capsule_shape_2d.h rename to scene/resources/2d/capsule_shape_2d.h index 4912466f968..cfd3fc6b267 100644 --- a/scene/resources/capsule_shape_2d.h +++ b/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 b/scene/resources/2d/circle_shape_2d.cpp similarity index 100% rename from scene/resources/circle_shape_2d.cpp rename to scene/resources/2d/circle_shape_2d.cpp diff --git a/scene/resources/circle_shape_2d.h b/scene/resources/2d/circle_shape_2d.h similarity index 98% rename from scene/resources/circle_shape_2d.h rename to scene/resources/2d/circle_shape_2d.h index ab0bff4ca83..203a8240ebb 100644 --- a/scene/resources/circle_shape_2d.h +++ b/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 b/scene/resources/2d/concave_polygon_shape_2d.cpp similarity index 100% rename from scene/resources/concave_polygon_shape_2d.cpp rename to scene/resources/2d/concave_polygon_shape_2d.cpp diff --git a/scene/resources/concave_polygon_shape_2d.h b/scene/resources/2d/concave_polygon_shape_2d.h similarity index 98% rename from scene/resources/concave_polygon_shape_2d.h rename to scene/resources/2d/concave_polygon_shape_2d.h index 7b3540a20d9..8b0b77acaa2 100644 --- a/scene/resources/concave_polygon_shape_2d.h +++ b/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); diff --git a/scene/resources/convex_polygon_shape_2d.cpp b/scene/resources/2d/convex_polygon_shape_2d.cpp similarity index 100% rename from scene/resources/convex_polygon_shape_2d.cpp rename to scene/resources/2d/convex_polygon_shape_2d.cpp diff --git a/scene/resources/convex_polygon_shape_2d.h b/scene/resources/2d/convex_polygon_shape_2d.h similarity index 98% rename from scene/resources/convex_polygon_shape_2d.h rename to scene/resources/2d/convex_polygon_shape_2d.h index 71b98a0d259..2e448f11335 100644 --- a/scene/resources/convex_polygon_shape_2d.h +++ b/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 b/scene/resources/2d/polygon_path_finder.cpp similarity index 100% rename from scene/resources/polygon_path_finder.cpp rename to scene/resources/2d/polygon_path_finder.cpp diff --git a/scene/resources/polygon_path_finder.h b/scene/resources/2d/polygon_path_finder.h similarity index 100% rename from scene/resources/polygon_path_finder.h rename to scene/resources/2d/polygon_path_finder.h diff --git a/scene/resources/rectangle_shape_2d.cpp b/scene/resources/2d/rectangle_shape_2d.cpp similarity index 100% rename from scene/resources/rectangle_shape_2d.cpp rename to scene/resources/2d/rectangle_shape_2d.cpp diff --git a/scene/resources/rectangle_shape_2d.h b/scene/resources/2d/rectangle_shape_2d.h similarity index 98% rename from scene/resources/rectangle_shape_2d.h rename to scene/resources/2d/rectangle_shape_2d.h index f990b5967e6..80fbc51b5c6 100644 --- a/scene/resources/rectangle_shape_2d.h +++ b/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 b/scene/resources/2d/segment_shape_2d.cpp similarity index 100% rename from scene/resources/segment_shape_2d.cpp rename to scene/resources/2d/segment_shape_2d.cpp diff --git a/scene/resources/segment_shape_2d.h b/scene/resources/2d/segment_shape_2d.h similarity index 98% rename from scene/resources/segment_shape_2d.h rename to scene/resources/2d/segment_shape_2d.h index 4bec192fd2a..ad2ece883d3 100644 --- a/scene/resources/segment_shape_2d.h +++ b/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 b/scene/resources/2d/separation_ray_shape_2d.cpp similarity index 100% rename from scene/resources/separation_ray_shape_2d.cpp rename to scene/resources/2d/separation_ray_shape_2d.cpp diff --git a/scene/resources/separation_ray_shape_2d.h b/scene/resources/2d/separation_ray_shape_2d.h similarity index 98% rename from scene/resources/separation_ray_shape_2d.h rename to scene/resources/2d/separation_ray_shape_2d.h index 8eab73d9c55..0359b41b6e9 100644 --- a/scene/resources/separation_ray_shape_2d.h +++ b/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 b/scene/resources/2d/shape_2d.cpp similarity index 100% rename from scene/resources/shape_2d.cpp rename to scene/resources/2d/shape_2d.cpp diff --git a/scene/resources/shape_2d.h b/scene/resources/2d/shape_2d.h similarity index 100% rename from scene/resources/shape_2d.h rename to scene/resources/2d/shape_2d.h diff --git a/scene/resources/skeleton_modification_2d.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d.cpp similarity index 100% rename from scene/resources/skeleton_modification_2d.cpp rename to scene/resources/2d/skeleton/skeleton_modification_2d.cpp diff --git a/scene/resources/skeleton_modification_2d.h b/scene/resources/2d/skeleton/skeleton_modification_2d.h similarity index 98% rename from scene/resources/skeleton_modification_2d.h rename to scene/resources/2d/skeleton/skeleton_modification_2d.h index c00c3c8dc24..413b860a990 100644 --- a/scene/resources/skeleton_modification_2d.h +++ b/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 diff --git a/scene/resources/skeleton_modification_2d_ccdik.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp similarity index 100% rename from scene/resources/skeleton_modification_2d_ccdik.cpp rename to scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp diff --git a/scene/resources/skeleton_modification_2d_ccdik.h b/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h similarity index 98% rename from scene/resources/skeleton_modification_2d_ccdik.h rename to scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h index 39ea02c1dfc..34da89c31ce 100644 --- a/scene/resources/skeleton_modification_2d_ccdik.h +++ b/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 diff --git a/scene/resources/skeleton_modification_2d_fabrik.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp similarity index 100% rename from scene/resources/skeleton_modification_2d_fabrik.cpp rename to scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp diff --git a/scene/resources/skeleton_modification_2d_fabrik.h b/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h similarity index 98% rename from scene/resources/skeleton_modification_2d_fabrik.h rename to scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h index 3c8f1f779c3..edc29ecf12f 100644 --- a/scene/resources/skeleton_modification_2d_fabrik.h +++ b/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 diff --git a/scene/resources/skeleton_modification_2d_jiggle.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp similarity index 100% rename from scene/resources/skeleton_modification_2d_jiggle.cpp rename to scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp diff --git a/scene/resources/skeleton_modification_2d_jiggle.h b/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h similarity index 98% rename from scene/resources/skeleton_modification_2d_jiggle.h rename to scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h index 9e0d8d1bd45..7e9855839c2 100644 --- a/scene/resources/skeleton_modification_2d_jiggle.h +++ b/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 diff --git a/scene/resources/skeleton_modification_2d_lookat.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp similarity index 100% rename from scene/resources/skeleton_modification_2d_lookat.cpp rename to scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp diff --git a/scene/resources/skeleton_modification_2d_lookat.h b/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h similarity index 98% rename from scene/resources/skeleton_modification_2d_lookat.h rename to scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h index d952d249f9e..fbce45b83ab 100644 --- a/scene/resources/skeleton_modification_2d_lookat.h +++ b/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 diff --git a/scene/resources/skeleton_modification_2d_physicalbones.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp similarity index 100% rename from scene/resources/skeleton_modification_2d_physicalbones.cpp rename to scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp diff --git a/scene/resources/skeleton_modification_2d_physicalbones.h b/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h similarity index 98% rename from scene/resources/skeleton_modification_2d_physicalbones.h rename to scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h index ec1b63bf739..09bf00782cf 100644 --- a/scene/resources/skeleton_modification_2d_physicalbones.h +++ b/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 diff --git a/scene/resources/skeleton_modification_2d_stackholder.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.cpp similarity index 100% rename from scene/resources/skeleton_modification_2d_stackholder.cpp rename to scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.cpp diff --git a/scene/resources/skeleton_modification_2d_stackholder.h b/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h similarity index 98% rename from scene/resources/skeleton_modification_2d_stackholder.h rename to scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h index 17fa5f5cfee..b1054f64296 100644 --- a/scene/resources/skeleton_modification_2d_stackholder.h +++ b/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 diff --git a/scene/resources/skeleton_modification_2d_twoboneik.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp similarity index 100% rename from scene/resources/skeleton_modification_2d_twoboneik.cpp rename to scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp diff --git a/scene/resources/skeleton_modification_2d_twoboneik.h b/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h similarity index 98% rename from scene/resources/skeleton_modification_2d_twoboneik.h rename to scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h index 7a5cd91c868..d528ffa66b0 100644 --- a/scene/resources/skeleton_modification_2d_twoboneik.h +++ b/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 diff --git a/scene/resources/skeleton_modification_stack_2d.cpp b/scene/resources/2d/skeleton/skeleton_modification_stack_2d.cpp similarity index 100% rename from scene/resources/skeleton_modification_stack_2d.cpp rename to scene/resources/2d/skeleton/skeleton_modification_stack_2d.cpp diff --git a/scene/resources/skeleton_modification_stack_2d.h b/scene/resources/2d/skeleton/skeleton_modification_stack_2d.h similarity index 98% rename from scene/resources/skeleton_modification_stack_2d.h rename to scene/resources/2d/skeleton/skeleton_modification_stack_2d.h index 6e501436fd3..07321539970 100644 --- a/scene/resources/skeleton_modification_stack_2d.h +++ b/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 diff --git a/scene/resources/tile_set.compat.inc b/scene/resources/2d/tile_set.compat.inc similarity index 100% rename from scene/resources/tile_set.compat.inc rename to scene/resources/2d/tile_set.compat.inc diff --git a/scene/resources/tile_set.cpp b/scene/resources/2d/tile_set.cpp similarity index 99% rename from scene/resources/tile_set.cpp rename to scene/resources/2d/tile_set.cpp index 7e08d727ac1..5ac7f127b01 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/2d/tile_set.cpp @@ -36,7 +36,6 @@ #include "core/templates/local_vector.h" #include "core/templates/rb_set.h" #include "scene/gui/control.h" -#include "scene/resources/convex_polygon_shape_2d.h" #include "scene/resources/image_texture.h" #include "servers/navigation_server_2d.h" diff --git a/scene/resources/tile_set.h b/scene/resources/2d/tile_set.h similarity index 99% rename from scene/resources/tile_set.h rename to scene/resources/2d/tile_set.h index f26ed461c30..b55afd2de59 100644 --- a/scene/resources/tile_set.h +++ b/scene/resources/2d/tile_set.h @@ -37,13 +37,11 @@ #include "core/templates/rb_set.h" #include "scene/2d/light_occluder_2d.h" #include "scene/main/canvas_item.h" -#include "scene/resources/concave_polygon_shape_2d.h" -#include "scene/resources/convex_polygon_shape_2d.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/packed_scene.h" #include "scene/resources/physics_material.h" -#include "scene/resources/shape_2d.h" #ifndef DISABLE_DEPRECATED #include "scene/resources/shader.h" diff --git a/scene/resources/world_boundary_shape_2d.cpp b/scene/resources/2d/world_boundary_shape_2d.cpp similarity index 100% rename from scene/resources/world_boundary_shape_2d.cpp rename to scene/resources/2d/world_boundary_shape_2d.cpp diff --git a/scene/resources/world_boundary_shape_2d.h b/scene/resources/2d/world_boundary_shape_2d.h similarity index 98% rename from scene/resources/world_boundary_shape_2d.h rename to scene/resources/2d/world_boundary_shape_2d.h index a79b8e4e1fe..a7f11e39b71 100644 --- a/scene/resources/world_boundary_shape_2d.h +++ b/scene/resources/2d/world_boundary_shape_2d.h @@ -31,7 +31,7 @@ #ifndef WORLD_BOUNDARY_SHAPE_2D_H #define WORLD_BOUNDARY_SHAPE_2D_H -#include "scene/resources/shape_2d.h" +#include "scene/resources/2d/shape_2d.h" class WorldBoundaryShape2D : public Shape2D { GDCLASS(WorldBoundaryShape2D, Shape2D); diff --git a/scene/resources/SCsub b/scene/resources/SCsub index 9e21c627f94..060b47d687e 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -22,3 +22,5 @@ env.scene_sources += scene_obj # Needed to force rebuilding the scene files when the thirdparty code is updated. env.Depends(scene_obj, thirdparty_obj) + +SConscript("2d/SCsub") diff --git a/scu_builders.py b/scu_builders.py index 56effb393c8..740b4ca5713 100644 --- a/scu_builders.py +++ b/scu_builders.py @@ -315,6 +315,7 @@ def generate_scu_files(max_includes_per_scu): process_folder(["scene/gui"]) process_folder(["scene/main"]) process_folder(["scene/resources"]) + process_folder(["scene/resources/2d"]) process_folder(["servers"]) process_folder(["servers/rendering"]) diff --git a/tests/scene/test_viewport.h b/tests/scene/test_viewport.h index 1afae66ee02..e15b01ae9f8 100644 --- a/tests/scene/test_viewport.h +++ b/tests/scene/test_viewport.h @@ -37,7 +37,7 @@ #include "scene/gui/subviewport_container.h" #include "scene/main/canvas_layer.h" #include "scene/main/window.h" -#include "scene/resources/rectangle_shape_2d.h" +#include "scene/resources/2d/rectangle_shape_2d.h" #include "tests/test_macros.h" From c399424db9ee39e94cd21569ee87567de10586e2 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 13 Aug 2021 11:42:45 -0500 Subject: [PATCH 2/2] Move 3D-only resources to their own folder --- editor/import/3d/editor_import_collada.cpp | 2 +- editor/import/3d/resource_importer_obj.cpp | 2 +- editor/import/3d/resource_importer_scene.cpp | 10 +++---- editor/import/3d/resource_importer_scene.h | 12 ++++---- editor/import/3d/scene_import_settings.cpp | 2 +- editor/import/3d/scene_import_settings.h | 2 +- .../collision_shape_3d_gizmo_plugin.cpp | 18 +++++------ .../gizmos/spring_arm_3d_gizmo_plugin.cpp | 2 +- editor/plugins/material_editor_plugin.cpp | 4 +-- editor/plugins/material_editor_plugin.h | 2 +- .../mesh_instance_3d_editor_plugin.cpp | 6 ++-- editor/plugins/mesh_library_editor_plugin.h | 2 +- editor/plugins/node_3d_editor_gizmos.cpp | 2 +- editor/plugins/node_3d_editor_plugin.cpp | 2 +- editor/plugins/skeleton_3d_editor_plugin.cpp | 3 +- modules/csg/csg_shape.h | 2 +- ...cument_extension_convert_importer_mesh.cpp | 2 +- .../extensions/physics/gltf_physics_shape.cpp | 14 ++++----- modules/gltf/gltf_document.cpp | 2 +- modules/gltf/structures/gltf_mesh.cpp | 2 +- modules/gltf/structures/gltf_mesh.h | 2 +- modules/gltf/structures/gltf_skin.cpp | 2 +- modules/gltf/structures/gltf_skin.h | 2 +- modules/gridmap/grid_map.cpp | 4 +-- modules/gridmap/grid_map.h | 2 +- .../navigation/3d/nav_mesh_generator_3d.cpp | 20 ++++++------- scene/3d/collision_object_3d.cpp | 2 +- scene/3d/collision_polygon_3d.cpp | 2 +- scene/3d/collision_polygon_3d.h | 2 +- scene/3d/collision_shape_3d.cpp | 6 ++-- scene/3d/collision_shape_3d.h | 2 +- scene/3d/gpu_particles_3d.h | 2 +- scene/3d/importer_mesh_instance_3d.cpp | 2 +- scene/3d/importer_mesh_instance_3d.h | 2 +- scene/3d/mesh_instance_3d.cpp | 4 +-- scene/3d/node_3d.h | 2 +- scene/3d/occluder_instance_3d.cpp | 2 +- scene/3d/shape_cast_3d.cpp | 2 +- scene/3d/shape_cast_3d.h | 2 +- scene/3d/skeleton_3d.h | 2 +- scene/3d/spring_arm_3d.cpp | 2 +- scene/main/scene_tree.cpp | 2 +- scene/register_scene_types.cpp | 30 +++++++++---------- scene/resources/3d/SCsub | 6 ++++ scene/resources/{ => 3d}/box_shape_3d.cpp | 0 scene/resources/{ => 3d}/box_shape_3d.h | 2 +- scene/resources/{ => 3d}/capsule_shape_3d.cpp | 0 scene/resources/{ => 3d}/capsule_shape_3d.h | 2 +- .../{ => 3d}/concave_polygon_shape_3d.cpp | 0 .../{ => 3d}/concave_polygon_shape_3d.h | 2 +- .../{ => 3d}/convex_polygon_shape_3d.cpp | 0 .../{ => 3d}/convex_polygon_shape_3d.h | 2 +- .../resources/{ => 3d}/cylinder_shape_3d.cpp | 0 scene/resources/{ => 3d}/cylinder_shape_3d.h | 2 +- scene/resources/{ => 3d}/fog_material.cpp | 0 scene/resources/{ => 3d}/fog_material.h | 0 .../{ => 3d}/height_map_shape_3d.cpp | 0 .../resources/{ => 3d}/height_map_shape_3d.h | 2 +- scene/resources/{ => 3d}/importer_mesh.cpp | 0 scene/resources/{ => 3d}/importer_mesh.h | 4 +-- scene/resources/{ => 3d}/mesh_library.cpp | 0 scene/resources/{ => 3d}/mesh_library.h | 0 scene/resources/{ => 3d}/primitive_meshes.cpp | 0 scene/resources/{ => 3d}/primitive_meshes.h | 0 .../{ => 3d}/separation_ray_shape_3d.cpp | 0 .../{ => 3d}/separation_ray_shape_3d.h | 2 +- scene/resources/{ => 3d}/shape_3d.cpp | 0 scene/resources/{ => 3d}/shape_3d.h | 0 scene/resources/{ => 3d}/skin.cpp | 0 scene/resources/{ => 3d}/skin.h | 0 scene/resources/{ => 3d}/sky_material.cpp | 0 scene/resources/{ => 3d}/sky_material.h | 0 scene/resources/{ => 3d}/sphere_shape_3d.cpp | 0 scene/resources/{ => 3d}/sphere_shape_3d.h | 2 +- scene/resources/{ => 3d}/world_3d.cpp | 0 scene/resources/{ => 3d}/world_3d.h | 0 .../{ => 3d}/world_boundary_shape_3d.cpp | 0 .../{ => 3d}/world_boundary_shape_3d.h | 2 +- scene/resources/SCsub | 1 + scene/resources/mesh.cpp | 4 +-- scene/resources/mesh.h | 1 + scu_builders.py | 1 + tests/scene/test_arraymesh.h | 2 +- tests/scene/test_navigation_region_3d.h | 2 +- tests/scene/test_primitives.h | 2 +- tests/servers/test_navigation_server_3d.h | 2 +- 86 files changed, 122 insertions(+), 114 deletions(-) create mode 100644 scene/resources/3d/SCsub rename scene/resources/{ => 3d}/box_shape_3d.cpp (100%) rename scene/resources/{ => 3d}/box_shape_3d.h (98%) rename scene/resources/{ => 3d}/capsule_shape_3d.cpp (100%) rename scene/resources/{ => 3d}/capsule_shape_3d.h (98%) rename scene/resources/{ => 3d}/concave_polygon_shape_3d.cpp (100%) rename scene/resources/{ => 3d}/concave_polygon_shape_3d.h (98%) rename scene/resources/{ => 3d}/convex_polygon_shape_3d.cpp (100%) rename scene/resources/{ => 3d}/convex_polygon_shape_3d.h (98%) rename scene/resources/{ => 3d}/cylinder_shape_3d.cpp (100%) rename scene/resources/{ => 3d}/cylinder_shape_3d.h (98%) rename scene/resources/{ => 3d}/fog_material.cpp (100%) rename scene/resources/{ => 3d}/fog_material.h (100%) rename scene/resources/{ => 3d}/height_map_shape_3d.cpp (100%) rename scene/resources/{ => 3d}/height_map_shape_3d.h (98%) rename scene/resources/{ => 3d}/importer_mesh.cpp (100%) rename scene/resources/{ => 3d}/importer_mesh.h (98%) rename scene/resources/{ => 3d}/mesh_library.cpp (100%) rename scene/resources/{ => 3d}/mesh_library.h (100%) rename scene/resources/{ => 3d}/primitive_meshes.cpp (100%) rename scene/resources/{ => 3d}/primitive_meshes.h (100%) rename scene/resources/{ => 3d}/separation_ray_shape_3d.cpp (100%) rename scene/resources/{ => 3d}/separation_ray_shape_3d.h (98%) rename scene/resources/{ => 3d}/shape_3d.cpp (100%) rename scene/resources/{ => 3d}/shape_3d.h (100%) rename scene/resources/{ => 3d}/skin.cpp (100%) rename scene/resources/{ => 3d}/skin.h (100%) rename scene/resources/{ => 3d}/sky_material.cpp (100%) rename scene/resources/{ => 3d}/sky_material.h (100%) rename scene/resources/{ => 3d}/sphere_shape_3d.cpp (100%) rename scene/resources/{ => 3d}/sphere_shape_3d.h (98%) rename scene/resources/{ => 3d}/world_3d.cpp (100%) rename scene/resources/{ => 3d}/world_3d.h (100%) rename scene/resources/{ => 3d}/world_boundary_shape_3d.cpp (100%) rename scene/resources/{ => 3d}/world_boundary_shape_3d.h (98%) diff --git a/editor/import/3d/editor_import_collada.cpp b/editor/import/3d/editor_import_collada.cpp index 49fec679bf8..b7dabf027b9 100644 --- a/editor/import/3d/editor_import_collada.cpp +++ b/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" diff --git a/editor/import/3d/resource_importer_obj.cpp b/editor/import/3d/resource_importer_obj.cpp index 4b340ea997f..52d1b45ac24 100644 --- a/editor/import/3d/resource_importer_obj.cpp +++ b/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" diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp index 7a51394bbc2..3310d6f298f 100644 --- a/editor/import/3d/resource_importer_scene.cpp +++ b/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; diff --git a/editor/import/3d/resource_importer_scene.h b/editor/import/3d/resource_importer_scene.h index f82a5aa9e9d..dbf7794b618 100644 --- a/editor/import/3d/resource_importer_scene.h +++ b/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; diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp index 53d7e63dbb7..aeff01fc85a 100644 --- a/editor/import/3d/scene_import_settings.cpp +++ b/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 { diff --git a/editor/import/3d/scene_import_settings.h b/editor/import/3d/scene_import_settings.h index c6c416daba9..05682551b79 100644 --- a/editor/import/3d/scene_import_settings.h +++ b/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; diff --git a/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp b/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp index 2695253b780..3cf91644607 100644 --- a/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp +++ b/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(); diff --git a/editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.cpp b/editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.cpp index cf022fc30f5..69acac5a891 100644 --- a/editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.cpp +++ b/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(p_gizmo->get_node_3d()); diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index b7c44795051..ba64c85b37c 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/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 &p_event) { ERR_FAIL_COND(p_event.is_null()); diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index 5530592a815..5d79d94aafd 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/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; diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp index 9669f992a83..061b839ee36 100644 --- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp +++ b/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) { diff --git a/editor/plugins/mesh_library_editor_plugin.h b/editor/plugins/mesh_library_editor_plugin.h index 7bdc70a00bc..3895d10c370 100644 --- a/editor/plugins/mesh_library_editor_plugin.h +++ b/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; diff --git a/editor/plugins/node_3d_editor_gizmos.cpp b/editor/plugins/node_3d_editor_gizmos.cpp index 77ed48a6624..085e8cddbea 100644 --- a/editor/plugins/node_3d_editor_gizmos.cpp +++ b/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 diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 64590653a4e..4e462cfe34b 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/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; diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp index 53fdde9e142..b6a6c8968ee 100644 --- a/editor/plugins/skeleton_3d_editor_plugin.cpp +++ b/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" diff --git a/modules/csg/csg_shape.h b/modules/csg/csg_shape.h index 6ac71b69460..bb7c8be4315 100644 --- a/modules/csg/csg_shape.h +++ b/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" diff --git a/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.cpp b/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.cpp index 2af716b8677..1e64a6daa43 100644 --- a/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.cpp +++ b/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() { } diff --git a/modules/gltf/extensions/physics/gltf_physics_shape.cpp b/modules/gltf/extensions/physics/gltf_physics_shape.cpp index af4ac10313f..467499a03f7 100644 --- a/modules/gltf/extensions/physics/gltf_physics_shape.cpp +++ b/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); diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index 7949d64920d..740c9a2aa73 100644 --- a/modules/gltf/gltf_document.cpp +++ b/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 diff --git a/modules/gltf/structures/gltf_mesh.cpp b/modules/gltf/structures/gltf_mesh.cpp index d04d3fcd7ff..9566cc2379b 100644 --- a/modules/gltf/structures/gltf_mesh.cpp +++ b/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); diff --git a/modules/gltf/structures/gltf_mesh.h b/modules/gltf/structures/gltf_mesh.h index c33e39df847..6983efeb2ae 100644 --- a/modules/gltf/structures/gltf_mesh.h +++ b/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); diff --git a/modules/gltf/structures/gltf_skin.cpp b/modules/gltf/structures/gltf_skin.cpp index 8097c7b3d04..18aa90a628c 100644 --- a/modules/gltf/structures/gltf_skin.cpp +++ b/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); diff --git a/modules/gltf/structures/gltf_skin.h b/modules/gltf/structures/gltf_skin.h index ce863da45dd..4649a918e3f 100644 --- a/modules/gltf/structures/gltf_skin.h +++ b/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 class TypedArray; diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index e3475b39592..fb449a67f85 100644 --- a/modules/gridmap/grid_map.cpp +++ b/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" diff --git a/modules/gridmap/grid_map.h b/modules/gridmap/grid_map.h index 348ac5194cb..7398a540ded 100644 --- a/modules/gridmap/grid_map.h +++ b/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.. diff --git a/modules/navigation/3d/nav_mesh_generator_3d.cpp b/modules/navigation/3d/nav_mesh_generator_3d.cpp index 95854f29e7b..4cd4f60edc7 100644 --- a/modules/navigation/3d/nav_mesh_generator_3d.cpp +++ b/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. diff --git a/scene/3d/collision_object_3d.cpp b/scene/3d/collision_object_3d.cpp index 0cfe0f8cb73..bbd2ef2fb83 100644 --- a/scene/3d/collision_object_3d.cpp +++ b/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) { diff --git a/scene/3d/collision_polygon_3d.cpp b/scene/3d/collision_polygon_3d.cpp index 9c1a7181aa5..abde05778d7 100644 --- a/scene/3d/collision_polygon_3d.cpp +++ b/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) { diff --git a/scene/3d/collision_polygon_3d.h b/scene/3d/collision_polygon_3d.h index 61290a7947f..fe4cf40ee31 100644 --- a/scene/3d/collision_polygon_3d.h +++ b/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 { diff --git a/scene/3d/collision_shape_3d.cpp b/scene/3d/collision_shape_3d.cpp index 61941a0e533..08fc62ae4fd 100644 --- a/scene/3d/collision_shape_3d.cpp +++ b/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() { diff --git a/scene/3d/collision_shape_3d.h b/scene/3d/collision_shape_3d.h index bc0e70f8ac0..15f6ef73cbf 100644 --- a/scene/3d/collision_shape_3d.h +++ b/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 { diff --git a/scene/3d/gpu_particles_3d.h b/scene/3d/gpu_particles_3d.h index 0c9f2c13783..b5aee6fe347 100644 --- a/scene/3d/gpu_particles_3d.h +++ b/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: diff --git a/scene/3d/importer_mesh_instance_3d.cpp b/scene/3d/importer_mesh_instance_3d.cpp index 2216b3818d5..ad44c9e56a8 100644 --- a/scene/3d/importer_mesh_instance_3d.cpp +++ b/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 &p_mesh) { mesh = p_mesh; diff --git a/scene/3d/importer_mesh_instance_3d.h b/scene/3d/importer_mesh_instance_3d.h index d48721383f9..fbd95d4b680 100644 --- a/scene/3d/importer_mesh_instance_3d.h +++ b/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; diff --git a/scene/3d/mesh_instance_3d.cpp b/scene/3d/mesh_instance_3d.cpp index 35baf81e895..eeb41573f70 100644 --- a/scene/3d/mesh_instance_3d.cpp +++ b/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. diff --git a/scene/3d/node_3d.h b/scene/3d/node_3d.h index 20030210c64..7f8c3e6e686 100644 --- a/scene/3d/node_3d.h +++ b/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); diff --git a/scene/3d/occluder_instance_3d.cpp b/scene/3d/occluder_instance_3d.cpp index a76488e479e..8d995a87850 100644 --- a/scene/3d/occluder_instance_3d.cpp +++ b/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 diff --git a/scene/3d/shape_cast_3d.cpp b/scene/3d/shape_cast_3d.cpp index 4d9eeada06c..2da5f52928f 100644 --- a/scene/3d/shape_cast_3d.cpp +++ b/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) { diff --git a/scene/3d/shape_cast_3d.h b/scene/3d/shape_cast_3d.h index 043e35090f3..9052db90469 100644 --- a/scene/3d/shape_cast_3d.h +++ b/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; diff --git a/scene/3d/skeleton_3d.h b/scene/3d/skeleton_3d.h index 458bbfb979c..979e2e52b72 100644 --- a/scene/3d/skeleton_3d.h +++ b/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; diff --git a/scene/3d/spring_arm_3d.cpp b/scene/3d/spring_arm_3d.cpp index 9151fa95935..8d2f10310c7 100644 --- a/scene/3d/spring_arm_3d.cpp +++ b/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) { diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index a29311af433..8d0bad6942d 100644 --- a/scene/main/scene_tree.cpp +++ b/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" diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 77a331f52cf..b156cd04222 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -194,7 +194,6 @@ #include "scene/resources/shader_include.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" @@ -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 resource_saver_text; diff --git a/scene/resources/3d/SCsub b/scene/resources/3d/SCsub new file mode 100644 index 00000000000..fdf20e0bde3 --- /dev/null +++ b/scene/resources/3d/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/box_shape_3d.cpp b/scene/resources/3d/box_shape_3d.cpp similarity index 100% rename from scene/resources/box_shape_3d.cpp rename to scene/resources/3d/box_shape_3d.cpp diff --git a/scene/resources/box_shape_3d.h b/scene/resources/3d/box_shape_3d.h similarity index 98% rename from scene/resources/box_shape_3d.h rename to scene/resources/3d/box_shape_3d.h index 8903a049e11..45c1cde5d7a 100644 --- a/scene/resources/box_shape_3d.h +++ b/scene/resources/3d/box_shape_3d.h @@ -31,7 +31,7 @@ #ifndef BOX_SHAPE_3D_H #define BOX_SHAPE_3D_H -#include "scene/resources/shape_3d.h" +#include "scene/resources/3d/shape_3d.h" class BoxShape3D : public Shape3D { GDCLASS(BoxShape3D, Shape3D); diff --git a/scene/resources/capsule_shape_3d.cpp b/scene/resources/3d/capsule_shape_3d.cpp similarity index 100% rename from scene/resources/capsule_shape_3d.cpp rename to scene/resources/3d/capsule_shape_3d.cpp diff --git a/scene/resources/capsule_shape_3d.h b/scene/resources/3d/capsule_shape_3d.h similarity index 98% rename from scene/resources/capsule_shape_3d.h rename to scene/resources/3d/capsule_shape_3d.h index 48e5851c183..90ee3b584ab 100644 --- a/scene/resources/capsule_shape_3d.h +++ b/scene/resources/3d/capsule_shape_3d.h @@ -31,7 +31,7 @@ #ifndef CAPSULE_SHAPE_3D_H #define CAPSULE_SHAPE_3D_H -#include "scene/resources/shape_3d.h" +#include "scene/resources/3d/shape_3d.h" class CapsuleShape3D : public Shape3D { GDCLASS(CapsuleShape3D, Shape3D); diff --git a/scene/resources/concave_polygon_shape_3d.cpp b/scene/resources/3d/concave_polygon_shape_3d.cpp similarity index 100% rename from scene/resources/concave_polygon_shape_3d.cpp rename to scene/resources/3d/concave_polygon_shape_3d.cpp diff --git a/scene/resources/concave_polygon_shape_3d.h b/scene/resources/3d/concave_polygon_shape_3d.h similarity index 98% rename from scene/resources/concave_polygon_shape_3d.h rename to scene/resources/3d/concave_polygon_shape_3d.h index 89ff742cb1d..a5e46474d59 100644 --- a/scene/resources/concave_polygon_shape_3d.h +++ b/scene/resources/3d/concave_polygon_shape_3d.h @@ -31,7 +31,7 @@ #ifndef CONCAVE_POLYGON_SHAPE_3D_H #define CONCAVE_POLYGON_SHAPE_3D_H -#include "scene/resources/shape_3d.h" +#include "scene/resources/3d/shape_3d.h" class ConcavePolygonShape3D : public Shape3D { GDCLASS(ConcavePolygonShape3D, Shape3D); diff --git a/scene/resources/convex_polygon_shape_3d.cpp b/scene/resources/3d/convex_polygon_shape_3d.cpp similarity index 100% rename from scene/resources/convex_polygon_shape_3d.cpp rename to scene/resources/3d/convex_polygon_shape_3d.cpp diff --git a/scene/resources/convex_polygon_shape_3d.h b/scene/resources/3d/convex_polygon_shape_3d.h similarity index 98% rename from scene/resources/convex_polygon_shape_3d.h rename to scene/resources/3d/convex_polygon_shape_3d.h index deb3d30f9be..7d1ac123c6a 100644 --- a/scene/resources/convex_polygon_shape_3d.h +++ b/scene/resources/3d/convex_polygon_shape_3d.h @@ -31,7 +31,7 @@ #ifndef CONVEX_POLYGON_SHAPE_3D_H #define CONVEX_POLYGON_SHAPE_3D_H -#include "scene/resources/shape_3d.h" +#include "scene/resources/3d/shape_3d.h" class ConvexPolygonShape3D : public Shape3D { GDCLASS(ConvexPolygonShape3D, Shape3D); diff --git a/scene/resources/cylinder_shape_3d.cpp b/scene/resources/3d/cylinder_shape_3d.cpp similarity index 100% rename from scene/resources/cylinder_shape_3d.cpp rename to scene/resources/3d/cylinder_shape_3d.cpp diff --git a/scene/resources/cylinder_shape_3d.h b/scene/resources/3d/cylinder_shape_3d.h similarity index 98% rename from scene/resources/cylinder_shape_3d.h rename to scene/resources/3d/cylinder_shape_3d.h index ea4b3bb96c7..bd57bc2a978 100644 --- a/scene/resources/cylinder_shape_3d.h +++ b/scene/resources/3d/cylinder_shape_3d.h @@ -31,7 +31,7 @@ #ifndef CYLINDER_SHAPE_3D_H #define CYLINDER_SHAPE_3D_H -#include "scene/resources/shape_3d.h" +#include "scene/resources/3d/shape_3d.h" class CylinderShape3D : public Shape3D { GDCLASS(CylinderShape3D, Shape3D); diff --git a/scene/resources/fog_material.cpp b/scene/resources/3d/fog_material.cpp similarity index 100% rename from scene/resources/fog_material.cpp rename to scene/resources/3d/fog_material.cpp diff --git a/scene/resources/fog_material.h b/scene/resources/3d/fog_material.h similarity index 100% rename from scene/resources/fog_material.h rename to scene/resources/3d/fog_material.h diff --git a/scene/resources/height_map_shape_3d.cpp b/scene/resources/3d/height_map_shape_3d.cpp similarity index 100% rename from scene/resources/height_map_shape_3d.cpp rename to scene/resources/3d/height_map_shape_3d.cpp diff --git a/scene/resources/height_map_shape_3d.h b/scene/resources/3d/height_map_shape_3d.h similarity index 98% rename from scene/resources/height_map_shape_3d.h rename to scene/resources/3d/height_map_shape_3d.h index eff025c816b..363d9ec0e92 100644 --- a/scene/resources/height_map_shape_3d.h +++ b/scene/resources/3d/height_map_shape_3d.h @@ -31,7 +31,7 @@ #ifndef HEIGHT_MAP_SHAPE_3D_H #define HEIGHT_MAP_SHAPE_3D_H -#include "scene/resources/shape_3d.h" +#include "scene/resources/3d/shape_3d.h" class HeightMapShape3D : public Shape3D { GDCLASS(HeightMapShape3D, Shape3D); diff --git a/scene/resources/importer_mesh.cpp b/scene/resources/3d/importer_mesh.cpp similarity index 100% rename from scene/resources/importer_mesh.cpp rename to scene/resources/3d/importer_mesh.cpp diff --git a/scene/resources/importer_mesh.h b/scene/resources/3d/importer_mesh.h similarity index 98% rename from scene/resources/importer_mesh.h rename to scene/resources/3d/importer_mesh.h index 7a19aabd291..ff8683449b5 100644 --- a/scene/resources/importer_mesh.h +++ b/scene/resources/3d/importer_mesh.h @@ -33,8 +33,8 @@ #include "core/io/resource.h" #include "core/templates/local_vector.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" #include "scene/resources/mesh.h" #include "scene/resources/navigation_mesh.h" diff --git a/scene/resources/mesh_library.cpp b/scene/resources/3d/mesh_library.cpp similarity index 100% rename from scene/resources/mesh_library.cpp rename to scene/resources/3d/mesh_library.cpp diff --git a/scene/resources/mesh_library.h b/scene/resources/3d/mesh_library.h similarity index 100% rename from scene/resources/mesh_library.h rename to scene/resources/3d/mesh_library.h diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/3d/primitive_meshes.cpp similarity index 100% rename from scene/resources/primitive_meshes.cpp rename to scene/resources/3d/primitive_meshes.cpp diff --git a/scene/resources/primitive_meshes.h b/scene/resources/3d/primitive_meshes.h similarity index 100% rename from scene/resources/primitive_meshes.h rename to scene/resources/3d/primitive_meshes.h diff --git a/scene/resources/separation_ray_shape_3d.cpp b/scene/resources/3d/separation_ray_shape_3d.cpp similarity index 100% rename from scene/resources/separation_ray_shape_3d.cpp rename to scene/resources/3d/separation_ray_shape_3d.cpp diff --git a/scene/resources/separation_ray_shape_3d.h b/scene/resources/3d/separation_ray_shape_3d.h similarity index 98% rename from scene/resources/separation_ray_shape_3d.h rename to scene/resources/3d/separation_ray_shape_3d.h index bf42aba77f7..f24f0eae9e6 100644 --- a/scene/resources/separation_ray_shape_3d.h +++ b/scene/resources/3d/separation_ray_shape_3d.h @@ -31,7 +31,7 @@ #ifndef SEPARATION_RAY_SHAPE_3D_H #define SEPARATION_RAY_SHAPE_3D_H -#include "scene/resources/shape_3d.h" +#include "scene/resources/3d/shape_3d.h" class SeparationRayShape3D : public Shape3D { GDCLASS(SeparationRayShape3D, Shape3D); diff --git a/scene/resources/shape_3d.cpp b/scene/resources/3d/shape_3d.cpp similarity index 100% rename from scene/resources/shape_3d.cpp rename to scene/resources/3d/shape_3d.cpp diff --git a/scene/resources/shape_3d.h b/scene/resources/3d/shape_3d.h similarity index 100% rename from scene/resources/shape_3d.h rename to scene/resources/3d/shape_3d.h diff --git a/scene/resources/skin.cpp b/scene/resources/3d/skin.cpp similarity index 100% rename from scene/resources/skin.cpp rename to scene/resources/3d/skin.cpp diff --git a/scene/resources/skin.h b/scene/resources/3d/skin.h similarity index 100% rename from scene/resources/skin.h rename to scene/resources/3d/skin.h diff --git a/scene/resources/sky_material.cpp b/scene/resources/3d/sky_material.cpp similarity index 100% rename from scene/resources/sky_material.cpp rename to scene/resources/3d/sky_material.cpp diff --git a/scene/resources/sky_material.h b/scene/resources/3d/sky_material.h similarity index 100% rename from scene/resources/sky_material.h rename to scene/resources/3d/sky_material.h diff --git a/scene/resources/sphere_shape_3d.cpp b/scene/resources/3d/sphere_shape_3d.cpp similarity index 100% rename from scene/resources/sphere_shape_3d.cpp rename to scene/resources/3d/sphere_shape_3d.cpp diff --git a/scene/resources/sphere_shape_3d.h b/scene/resources/3d/sphere_shape_3d.h similarity index 98% rename from scene/resources/sphere_shape_3d.h rename to scene/resources/3d/sphere_shape_3d.h index e98eff12e2b..8e95cea6081 100644 --- a/scene/resources/sphere_shape_3d.h +++ b/scene/resources/3d/sphere_shape_3d.h @@ -31,7 +31,7 @@ #ifndef SPHERE_SHAPE_3D_H #define SPHERE_SHAPE_3D_H -#include "scene/resources/shape_3d.h" +#include "scene/resources/3d/shape_3d.h" class SphereShape3D : public Shape3D { GDCLASS(SphereShape3D, Shape3D); diff --git a/scene/resources/world_3d.cpp b/scene/resources/3d/world_3d.cpp similarity index 100% rename from scene/resources/world_3d.cpp rename to scene/resources/3d/world_3d.cpp diff --git a/scene/resources/world_3d.h b/scene/resources/3d/world_3d.h similarity index 100% rename from scene/resources/world_3d.h rename to scene/resources/3d/world_3d.h diff --git a/scene/resources/world_boundary_shape_3d.cpp b/scene/resources/3d/world_boundary_shape_3d.cpp similarity index 100% rename from scene/resources/world_boundary_shape_3d.cpp rename to scene/resources/3d/world_boundary_shape_3d.cpp diff --git a/scene/resources/world_boundary_shape_3d.h b/scene/resources/3d/world_boundary_shape_3d.h similarity index 98% rename from scene/resources/world_boundary_shape_3d.h rename to scene/resources/3d/world_boundary_shape_3d.h index 1f4cc674759..06cff6aa9ad 100644 --- a/scene/resources/world_boundary_shape_3d.h +++ b/scene/resources/3d/world_boundary_shape_3d.h @@ -31,7 +31,7 @@ #ifndef WORLD_BOUNDARY_SHAPE_3D_H #define WORLD_BOUNDARY_SHAPE_3D_H -#include "scene/resources/shape_3d.h" +#include "scene/resources/3d/shape_3d.h" class WorldBoundaryShape3D : public Shape3D { GDCLASS(WorldBoundaryShape3D, Shape3D); diff --git a/scene/resources/SCsub b/scene/resources/SCsub index 060b47d687e..ceff213a029 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -24,3 +24,4 @@ env.scene_sources += scene_obj env.Depends(scene_obj, thirdparty_obj) SConscript("2d/SCsub") +SConscript("3d/SCsub") diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index dcad58e6e20..a4e634af362 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -34,8 +34,8 @@ #include "core/templates/pair.h" #include "scene/resources/surface_tool.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" void MeshConvexDecompositionSettings::set_max_concavity(real_t p_max_concavity) { max_concavity = CLAMP(p_max_concavity, 0.001, 1.0); diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index 5233d750097..5c0e4e60aa3 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -34,6 +34,7 @@ #include "core/io/resource.h" #include "core/math/face3.h" #include "core/math/triangle_mesh.h" +#include "scene/resources/3d/shape_3d.h" #include "scene/resources/material.h" #include "servers/rendering_server.h" diff --git a/scu_builders.py b/scu_builders.py index 740b4ca5713..1a75f19b302 100644 --- a/scu_builders.py +++ b/scu_builders.py @@ -316,6 +316,7 @@ def generate_scu_files(max_includes_per_scu): process_folder(["scene/main"]) process_folder(["scene/resources"]) process_folder(["scene/resources/2d"]) + process_folder(["scene/resources/3d"]) process_folder(["servers"]) process_folder(["servers/rendering"]) diff --git a/tests/scene/test_arraymesh.h b/tests/scene/test_arraymesh.h index 1623b413007..67aa19c5d3e 100644 --- a/tests/scene/test_arraymesh.h +++ b/tests/scene/test_arraymesh.h @@ -31,8 +31,8 @@ #ifndef TEST_ARRAYMESH_H #define TEST_ARRAYMESH_H +#include "scene/resources/3d/primitive_meshes.h" #include "scene/resources/mesh.h" -#include "scene/resources/primitive_meshes.h" #include "tests/test_macros.h" diff --git a/tests/scene/test_navigation_region_3d.h b/tests/scene/test_navigation_region_3d.h index f7cf7c79129..372f6dc5057 100644 --- a/tests/scene/test_navigation_region_3d.h +++ b/tests/scene/test_navigation_region_3d.h @@ -34,7 +34,7 @@ #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/navigation_region_3d.h" #include "scene/main/window.h" -#include "scene/resources/primitive_meshes.h" +#include "scene/resources/3d/primitive_meshes.h" #include "tests/test_macros.h" diff --git a/tests/scene/test_primitives.h b/tests/scene/test_primitives.h index 36b9b17b279..f105e1ac04f 100644 --- a/tests/scene/test_primitives.h +++ b/tests/scene/test_primitives.h @@ -31,7 +31,7 @@ #ifndef TEST_PRIMITIVES_H #define TEST_PRIMITIVES_H -#include "scene/resources/primitive_meshes.h" +#include "scene/resources/3d/primitive_meshes.h" #include "tests/test_macros.h" diff --git a/tests/servers/test_navigation_server_3d.h b/tests/servers/test_navigation_server_3d.h index 5b5c1faac87..b5547f2c948 100644 --- a/tests/servers/test_navigation_server_3d.h +++ b/tests/servers/test_navigation_server_3d.h @@ -32,7 +32,7 @@ #define TEST_NAVIGATION_SERVER_3D_H #include "scene/3d/mesh_instance_3d.h" -#include "scene/resources/primitive_meshes.h" +#include "scene/resources/3d/primitive_meshes.h" #include "servers/navigation_server_3d.h" #include "tests/test_macros.h"