From c399424db9ee39e94cd21569ee87567de10586e2 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 13 Aug 2021 11:42:45 -0500 Subject: [PATCH] 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"