diff --git a/core/scene/SCsub b/core/scene/SCsub index 806cdb878..5dca0accb 100644 --- a/core/scene/SCsub +++ b/core/scene/SCsub @@ -3,4 +3,5 @@ Import("env") env.add_source_files(env.core_sources, "resources/*.cpp") +env.add_source_files(env.core_sources, "resources/shapes/*.cpp") #env.add_source_files(env.core_sources, "*.cpp") diff --git a/scene/resources/shapes/box_shape.cpp b/core/scene/resources/shapes/box_shape.cpp similarity index 100% rename from scene/resources/shapes/box_shape.cpp rename to core/scene/resources/shapes/box_shape.cpp diff --git a/scene/resources/shapes/box_shape.h b/core/scene/resources/shapes/box_shape.h similarity index 98% rename from scene/resources/shapes/box_shape.h rename to core/scene/resources/shapes/box_shape.h index 7a90f4efd..b742cbbaf 100644 --- a/scene/resources/shapes/box_shape.h +++ b/core/scene/resources/shapes/box_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class BoxShape : public Shape { GDCLASS(BoxShape, Shape); diff --git a/scene/resources/shapes/capsule_shape.cpp b/core/scene/resources/shapes/capsule_shape.cpp similarity index 100% rename from scene/resources/shapes/capsule_shape.cpp rename to core/scene/resources/shapes/capsule_shape.cpp diff --git a/scene/resources/shapes/capsule_shape.h b/core/scene/resources/shapes/capsule_shape.h similarity index 98% rename from scene/resources/shapes/capsule_shape.h rename to core/scene/resources/shapes/capsule_shape.h index 6d1740388..378c65a76 100644 --- a/scene/resources/shapes/capsule_shape.h +++ b/core/scene/resources/shapes/capsule_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class CapsuleShape : public Shape { GDCLASS(CapsuleShape, Shape); diff --git a/scene/resources/shapes/concave_polygon_shape.cpp b/core/scene/resources/shapes/concave_polygon_shape.cpp similarity index 100% rename from scene/resources/shapes/concave_polygon_shape.cpp rename to core/scene/resources/shapes/concave_polygon_shape.cpp diff --git a/scene/resources/shapes/concave_polygon_shape.h b/core/scene/resources/shapes/concave_polygon_shape.h similarity index 98% rename from scene/resources/shapes/concave_polygon_shape.h rename to core/scene/resources/shapes/concave_polygon_shape.h index 191915835..8fe652f31 100644 --- a/scene/resources/shapes/concave_polygon_shape.h +++ b/core/scene/resources/shapes/concave_polygon_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class ConcavePolygonShape : public Shape { GDCLASS(ConcavePolygonShape, Shape); diff --git a/scene/resources/shapes/convex_polygon_shape.cpp b/core/scene/resources/shapes/convex_polygon_shape.cpp similarity index 100% rename from scene/resources/shapes/convex_polygon_shape.cpp rename to core/scene/resources/shapes/convex_polygon_shape.cpp diff --git a/scene/resources/shapes/convex_polygon_shape.h b/core/scene/resources/shapes/convex_polygon_shape.h similarity index 98% rename from scene/resources/shapes/convex_polygon_shape.h rename to core/scene/resources/shapes/convex_polygon_shape.h index c994cdaa4..03759c1d0 100644 --- a/scene/resources/shapes/convex_polygon_shape.h +++ b/core/scene/resources/shapes/convex_polygon_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class ConvexPolygonShape : public Shape { GDCLASS(ConvexPolygonShape, Shape); diff --git a/scene/resources/shapes/cylinder_shape.cpp b/core/scene/resources/shapes/cylinder_shape.cpp similarity index 100% rename from scene/resources/shapes/cylinder_shape.cpp rename to core/scene/resources/shapes/cylinder_shape.cpp diff --git a/scene/resources/shapes/cylinder_shape.h b/core/scene/resources/shapes/cylinder_shape.h similarity index 98% rename from scene/resources/shapes/cylinder_shape.h rename to core/scene/resources/shapes/cylinder_shape.h index 2ae73481c..0f7f023b1 100644 --- a/scene/resources/shapes/cylinder_shape.h +++ b/core/scene/resources/shapes/cylinder_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class CylinderShape : public Shape { GDCLASS(CylinderShape, Shape); diff --git a/scene/resources/shapes/height_map_shape.cpp b/core/scene/resources/shapes/height_map_shape.cpp similarity index 100% rename from scene/resources/shapes/height_map_shape.cpp rename to core/scene/resources/shapes/height_map_shape.cpp diff --git a/scene/resources/shapes/height_map_shape.h b/core/scene/resources/shapes/height_map_shape.h similarity index 98% rename from scene/resources/shapes/height_map_shape.h rename to core/scene/resources/shapes/height_map_shape.h index af63b42d7..914c30d69 100644 --- a/scene/resources/shapes/height_map_shape.h +++ b/core/scene/resources/shapes/height_map_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class HeightMapShape : public Shape { GDCLASS(HeightMapShape, Shape); diff --git a/scene/resources/shapes/plane_shape.cpp b/core/scene/resources/shapes/plane_shape.cpp similarity index 100% rename from scene/resources/shapes/plane_shape.cpp rename to core/scene/resources/shapes/plane_shape.cpp diff --git a/scene/resources/shapes/plane_shape.h b/core/scene/resources/shapes/plane_shape.h similarity index 98% rename from scene/resources/shapes/plane_shape.h rename to core/scene/resources/shapes/plane_shape.h index bcf2c9984..9fe1d1af8 100644 --- a/scene/resources/shapes/plane_shape.h +++ b/core/scene/resources/shapes/plane_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class PlaneShape : public Shape { GDCLASS(PlaneShape, Shape); diff --git a/scene/resources/shapes/ray_shape.cpp b/core/scene/resources/shapes/ray_shape.cpp similarity index 100% rename from scene/resources/shapes/ray_shape.cpp rename to core/scene/resources/shapes/ray_shape.cpp diff --git a/scene/resources/shapes/ray_shape.h b/core/scene/resources/shapes/ray_shape.h similarity index 98% rename from scene/resources/shapes/ray_shape.h rename to core/scene/resources/shapes/ray_shape.h index 2c154cc97..ed34cee4d 100644 --- a/scene/resources/shapes/ray_shape.h +++ b/core/scene/resources/shapes/ray_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class RayShape : public Shape { GDCLASS(RayShape, Shape); diff --git a/scene/resources/shapes/shape.cpp b/core/scene/resources/shapes/shape.cpp similarity index 100% rename from scene/resources/shapes/shape.cpp rename to core/scene/resources/shapes/shape.cpp diff --git a/scene/resources/shapes/shape.h b/core/scene/resources/shapes/shape.h similarity index 100% rename from scene/resources/shapes/shape.h rename to core/scene/resources/shapes/shape.h diff --git a/scene/resources/shapes/sphere_shape.cpp b/core/scene/resources/shapes/sphere_shape.cpp similarity index 100% rename from scene/resources/shapes/sphere_shape.cpp rename to core/scene/resources/shapes/sphere_shape.cpp diff --git a/scene/resources/shapes/sphere_shape.h b/core/scene/resources/shapes/sphere_shape.h similarity index 98% rename from scene/resources/shapes/sphere_shape.h rename to core/scene/resources/shapes/sphere_shape.h index c304f2e2d..c1c597e0a 100644 --- a/scene/resources/shapes/sphere_shape.h +++ b/core/scene/resources/shapes/sphere_shape.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class SphereShape : public Shape { GDCLASS(SphereShape, Shape); diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index fd6335d2e..2767cd1db 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -41,15 +41,15 @@ #include "scene/3d/vehicle_body.h" #include "scene/animation/animation_player.h" #include "scene/animation/animation.h" -#include "scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/box_shape.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/packed_scene.h" -#include "scene/resources/shapes/plane_shape.h" -#include "scene/resources/shapes/ray_shape.h" +#include "core/scene/resources/shapes/plane_shape.h" +#include "core/scene/resources/shapes/ray_shape.h" #include "scene/resources/resource_format_text.h" -#include "scene/resources/shapes/shape.h" -#include "scene/resources/shapes/sphere_shape.h" +#include "core/scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/sphere_shape.h" uint32_t EditorSceneImporter::get_import_flags() const { if (get_script_instance()) { diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp index aaea25a25..140c37ab6 100644 --- a/editor/plugins/mesh_instance_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_editor_plugin.cpp @@ -61,7 +61,7 @@ #include "scene/main/scene_tree.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/navigation/navigation_mesh.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "spatial_editor_plugin.h" void MeshInstanceEditor::_node_removed(Node *p_node) { diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 7044376b5..8d05eabd0 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -93,7 +93,7 @@ #include "scene/resources/gradient.h" #include "scene/resources/packed_scene.h" #include "scene/resources/shader.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "scene/resources/style_box.h" #include "scene/resources/mesh/surface_tool.h" #include "scene/resources/world_3d.h" diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index 1e1b18407..5d73b8bba 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -86,21 +86,21 @@ #include "scene/main/scene_tree.h" #include "scene/main/timer.h" #include "scene/main/viewport.h" -#include "scene/resources/shapes/box_shape.h" -#include "scene/resources/shapes/capsule_shape.h" -#include "scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/shapes/convex_polygon_shape.h" -#include "scene/resources/shapes/cylinder_shape.h" -#include "scene/resources/shapes/height_map_shape.h" +#include "core/scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/capsule_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/convex_polygon_shape.h" +#include "core/scene/resources/shapes/cylinder_shape.h" +#include "core/scene/resources/shapes/height_map_shape.h" #include "scene/resources/material/material.h" #include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/occluder_shape.h" #include "scene/resources/occluder_shape_polygon.h" -#include "scene/resources/shapes/plane_shape.h" +#include "core/scene/resources/shapes/plane_shape.h" #include "scene/resources/mesh/primitive_meshes.h" -#include "scene/resources/shapes/ray_shape.h" -#include "scene/resources/shapes/shape.h" -#include "scene/resources/shapes/sphere_shape.h" +#include "core/scene/resources/shapes/ray_shape.h" +#include "core/scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/sphere_shape.h" #include "scene/resources/mesh/surface_tool.h" #include "scene/resources/world_3d.h" #include "servers/navigation_server.h" diff --git a/editor_modules/gltf/extensions/physics/gltf_collider.cpp b/editor_modules/gltf/extensions/physics/gltf_collider.cpp index 04068358a..b4543675a 100644 --- a/editor_modules/gltf/extensions/physics/gltf_collider.cpp +++ b/editor_modules/gltf/extensions/physics/gltf_collider.cpp @@ -33,12 +33,12 @@ #include "../../gltf_state.h" #include "core/math/convex_hull.h" #include "scene/3d/area.h" -#include "scene/resources/shapes/box_shape.h" -#include "scene/resources/shapes/capsule_shape.h" -#include "scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/shapes/convex_polygon_shape.h" -#include "scene/resources/shapes/cylinder_shape.h" -#include "scene/resources/shapes/sphere_shape.h" +#include "core/scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/capsule_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/convex_polygon_shape.h" +#include "core/scene/resources/shapes/cylinder_shape.h" +#include "core/scene/resources/shapes/sphere_shape.h" void GLTFCollider::_bind_methods() { ClassDB::bind_method(D_METHOD("to_node", "cache_shapes"), &GLTFCollider::to_node, DEFVAL(false)); diff --git a/modules/csg/csg_shape.h b/modules/csg/csg_shape.h index de0edb2bb..43e77bf21 100644 --- a/modules/csg/csg_shape.h +++ b/modules/csg/csg_shape.h @@ -36,7 +36,7 @@ #include "csg.h" #include "scene/3d/path.h" #include "scene/3d/visual_instance.h" -#include "scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" #include "thirdparty/misc/mikktspace.h" class CSGShape : public GeometryInstance { diff --git a/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp b/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp index adac1404b..04a513c75 100644 --- a/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp +++ b/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp @@ -35,18 +35,18 @@ #include "core/math/convex_hull.h" #include "scene/3d/mesh_instance.h" #include "scene/3d/physics_body.h" -#include "scene/resources/shapes/box_shape.h" -#include "scene/resources/shapes/capsule_shape.h" -#include "scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/shapes/convex_polygon_shape.h" -#include "scene/resources/shapes/cylinder_shape.h" -#include "scene/resources/shapes/height_map_shape.h" +#include "core/scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/capsule_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/convex_polygon_shape.h" +#include "core/scene/resources/shapes/cylinder_shape.h" +#include "core/scene/resources/shapes/height_map_shape.h" #include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h" -#include "scene/resources/shapes/plane_shape.h" +#include "core/scene/resources/shapes/plane_shape.h" #include "scene/resources/mesh/primitive_meshes.h" -#include "scene/resources/shapes/shape.h" -#include "scene/resources/shapes/sphere_shape.h" +#include "core/scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/sphere_shape.h" bool GridMap3DNavigationGeometryParser3D::parses_node(Node *p_node) { return (Object::cast_to(p_node) != nullptr); diff --git a/modules/gridmap/mesh_library.cpp b/modules/gridmap/mesh_library.cpp index b97685fd2..611b37857 100644 --- a/modules/gridmap/mesh_library.cpp +++ b/modules/gridmap/mesh_library.cpp @@ -30,7 +30,7 @@ #include "mesh_library.h" -#include "scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/box_shape.h" #include "scene/resources/navigation/navigation_mesh.h" MeshLibrary::Item::Item() { diff --git a/modules/gridmap/mesh_library.h b/modules/gridmap/mesh_library.h index 02e54eb32..633899417 100644 --- a/modules/gridmap/mesh_library.h +++ b/modules/gridmap/mesh_library.h @@ -35,7 +35,7 @@ #include "core/object/resource.h" #include "scene/3d/navigation_mesh_instance.h" #include "scene/resources/mesh/mesh.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class NavigationMesh; diff --git a/modules/mesh_data_resource/mesh_data_resource.h b/modules/mesh_data_resource/mesh_data_resource.h index 089f2ffe9..1f0433def 100644 --- a/modules/mesh_data_resource/mesh_data_resource.h +++ b/modules/mesh_data_resource/mesh_data_resource.h @@ -29,7 +29,7 @@ SOFTWARE. #include "scene/resources/mesh/mesh.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class MeshDataResource : public Resource { GDCLASS(MeshDataResource, Resource); diff --git a/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp b/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp index 7dcb2307f..6fd582f44 100644 --- a/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp +++ b/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp @@ -22,13 +22,13 @@ SOFTWARE. #include "mdr_import_plugin_base.h" -#include "scene/resources/shapes/box_shape.h" -#include "scene/resources/shapes/capsule_shape.h" -#include "scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/shapes/convex_polygon_shape.h" -#include "scene/resources/shapes/cylinder_shape.h" -#include "scene/resources/shapes/shape.h" -#include "scene/resources/shapes/sphere_shape.h" +#include "core/scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/capsule_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/convex_polygon_shape.h" +#include "core/scene/resources/shapes/cylinder_shape.h" +#include "core/scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/sphere_shape.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp b/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp index 4d272aa49..04cce7fdc 100644 --- a/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp +++ b/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp @@ -33,16 +33,16 @@ #include "core/math/convex_hull.h" #include "scene/3d/mesh_instance.h" #include "scene/3d/physics_body.h" -#include "scene/resources/shapes/box_shape.h" -#include "scene/resources/shapes/capsule_shape.h" -#include "scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/shapes/convex_polygon_shape.h" -#include "scene/resources/shapes/cylinder_shape.h" -#include "scene/resources/shapes/height_map_shape.h" -#include "scene/resources/shapes/plane_shape.h" +#include "core/scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/capsule_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/convex_polygon_shape.h" +#include "core/scene/resources/shapes/cylinder_shape.h" +#include "core/scene/resources/shapes/height_map_shape.h" +#include "core/scene/resources/shapes/plane_shape.h" #include "scene/resources/mesh/primitive_meshes.h" -#include "scene/resources/shapes/shape.h" -#include "scene/resources/shapes/sphere_shape.h" +#include "core/scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/sphere_shape.h" #include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h" diff --git a/modules/props/prop_instance_merger.cpp b/modules/props/prop_instance_merger.cpp index 91a1f5ce8..8f908b5cb 100644 --- a/modules/props/prop_instance_merger.cpp +++ b/modules/props/prop_instance_merger.cpp @@ -48,7 +48,7 @@ #include "tiled_wall/tiled_wall_data.h" -#include "scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/box_shape.h" const float PropInstanceMerger::LOD_CHECK_INTERVAL = 2; diff --git a/modules/props/prop_instance_prop_job.cpp b/modules/props/prop_instance_prop_job.cpp index 383972077..65070eb64 100644 --- a/modules/props/prop_instance_prop_job.cpp +++ b/modules/props/prop_instance_prop_job.cpp @@ -28,7 +28,7 @@ SOFTWARE. #include "prop_instance.h" #include "prop_instance_merger.h" #include "prop_mesher.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" #include "core/servers/physics/physics_server.h" #include "singleton/prop_cache.h" diff --git a/modules/props_2d/prop_2d_instance_merger.cpp b/modules/props_2d/prop_2d_instance_merger.cpp index 08f00ffed..2bc6b376c 100644 --- a/modules/props_2d/prop_2d_instance_merger.cpp +++ b/modules/props_2d/prop_2d_instance_merger.cpp @@ -45,7 +45,7 @@ #include "tiled_wall/tiled_wall_2d_data.h" -#include "scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/box_shape.h" bool Prop2DInstanceMerger::get_building() { return _building; diff --git a/modules/props_2d/prop_2d_instance_prop_job.cpp b/modules/props_2d/prop_2d_instance_prop_job.cpp index e6b9b9c53..3da8863ea 100644 --- a/modules/props_2d/prop_2d_instance_prop_job.cpp +++ b/modules/props_2d/prop_2d_instance_prop_job.cpp @@ -27,7 +27,7 @@ SOFTWARE. #include "prop_2d_instance.h" #include "prop_2d_instance_merger.h" #include "prop_2d_mesher.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "singleton/prop_2d_cache.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp b/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp index a28eb552b..63dc6e323 100644 --- a/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp +++ b/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp @@ -55,8 +55,8 @@ #include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" #include "scene/main/viewport.h" -#include "scene/resources/shapes/capsule_shape.h" -#include "scene/resources/shapes/sphere_shape.h" +#include "core/scene/resources/shapes/capsule_shape.h" +#include "core/scene/resources/shapes/sphere_shape.h" #include "scene/resources/mesh/surface_tool.h" #include "physical_bone_editor_plugin.h" diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index c483dccd8..730b54c16 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "area.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "scene/main/scene_string_names.h" #include "servers/audio_server.h" #include "core/servers/physics/physics_server.h" diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index fa7052be4..b05658790 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -36,7 +36,7 @@ #include "scene/3d/listener.h" #include "scene/3d/spatial_velocity_tracker.h" #include "scene/main/viewport.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" #include "servers/audio/audio_stream.h" #include "core/servers/physics/physics_server.h" diff --git a/scene/3d/collision_object.h b/scene/3d/collision_object.h index 9c041a9b1..ebe21f962 100644 --- a/scene/3d/collision_object.h +++ b/scene/3d/collision_object.h @@ -32,7 +32,7 @@ #include "core/object/reference.h" #include "scene/main/spatial.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" class CollisionObject : public Spatial { GDCLASS(CollisionObject, Spatial); diff --git a/scene/3d/collision_polygon.cpp b/scene/3d/collision_polygon.cpp index 159c2a58d..b54a66cda 100644 --- a/scene/3d/collision_polygon.cpp +++ b/scene/3d/collision_polygon.cpp @@ -32,9 +32,9 @@ #include "collision_object.h" #include "core/math/geometry.h" -#include "scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/shapes/convex_polygon_shape.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/convex_polygon_shape.h" +#include "core/scene/resources/shapes/shape.h" void CollisionPolygon::_build_polygon() { if (!parent) { diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp index 26923454f..db5e7c3ae 100644 --- a/scene/3d/collision_shape.cpp +++ b/scene/3d/collision_shape.cpp @@ -33,15 +33,15 @@ #include "core/math/quick_hull.h" #include "mesh_instance.h" #include "physics_body.h" -#include "scene/resources/shapes/box_shape.h" -#include "scene/resources/shapes/capsule_shape.h" -#include "scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/shapes/convex_polygon_shape.h" +#include "core/scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/capsule_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/convex_polygon_shape.h" #include "scene/resources/mesh/mesh.h" -#include "scene/resources/shapes/plane_shape.h" -#include "scene/resources/shapes/ray_shape.h" -#include "scene/resources/shapes/shape.h" -#include "scene/resources/shapes/sphere_shape.h" +#include "core/scene/resources/shapes/plane_shape.h" +#include "core/scene/resources/shapes/ray_shape.h" +#include "core/scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/sphere_shape.h" #include "core/servers/rendering/rendering_server.h" void CollisionShape::make_convex_from_brothers() { diff --git a/scene/3d/navigation_obstacle.cpp b/scene/3d/navigation_obstacle.cpp index 51b8994e4..c18d6184e 100644 --- a/scene/3d/navigation_obstacle.cpp +++ b/scene/3d/navigation_obstacle.cpp @@ -37,7 +37,7 @@ #include "scene/main/spatial.h" #include "scene/resources/material/material.h" #include "scene/resources/mesh/mesh.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" #include "servers/navigation_server.h" #include "core/servers/rendering/rendering_server.h" diff --git a/scene/3d/physics_joint.cpp b/scene/3d/physics_joint.cpp index b8f3b74e2..2fb89e43f 100644 --- a/scene/3d/physics_joint.cpp +++ b/scene/3d/physics_joint.cpp @@ -31,7 +31,7 @@ #include "physics_joint.h" #include "scene/3d/physics_body.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "scene/main/scene_string_names.h" void Joint::_disconnect_signals() { diff --git a/scene/3d/shape_cast.cpp b/scene/3d/shape_cast.cpp index b296b8dea..7cf27c071 100644 --- a/scene/3d/shape_cast.cpp +++ b/scene/3d/shape_cast.cpp @@ -33,7 +33,7 @@ #include "collision_object.h" #include "core/config/engine.h" #include "mesh_instance.h" -#include "scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" #include "scene/resources/material/material.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/world_3d.h" diff --git a/scene/3d/shape_cast.h b/scene/3d/shape_cast.h index d68380b4c..83daa6e6b 100644 --- a/scene/3d/shape_cast.h +++ b/scene/3d/shape_cast.h @@ -34,7 +34,7 @@ #include "core/math/color.h" #include "scene/main/spatial.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "core/servers/physics/physics_server.h" class SpatialMaterial; diff --git a/scene/3d/spring_arm.cpp b/scene/3d/spring_arm.cpp index c63de45b8..19e6f6bbe 100644 --- a/scene/3d/spring_arm.cpp +++ b/scene/3d/spring_arm.cpp @@ -31,8 +31,8 @@ #include "spring_arm.h" #include "core/config/engine.h" #include "scene/3d/collision_object.h" -#include "scene/resources/shapes/shape.h" -#include "scene/resources/shapes/sphere_shape.h" +#include "core/scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/sphere_shape.h" #include "scene/resources/world_3d.h" #include "core/servers/physics/physics_server.h" diff --git a/scene/3d/vehicle_body.cpp b/scene/3d/vehicle_body.cpp index 11e3215e1..9e4b825df 100644 --- a/scene/3d/vehicle_body.cpp +++ b/scene/3d/vehicle_body.cpp @@ -30,7 +30,7 @@ #include "vehicle_body.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #define ROLLING_INFLUENCE_FIX diff --git a/scene/3d/visibility_notifier.cpp b/scene/3d/visibility_notifier.cpp index 76f9e1d77..81a091a08 100644 --- a/scene/3d/visibility_notifier.cpp +++ b/scene/3d/visibility_notifier.cpp @@ -35,7 +35,7 @@ #include "scene/3d/physics_body.h" #include "scene/animation/animation_player.h" #include "scene/animation/animation_tree.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" #include "scene/main/scene_string_names.h" diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 4f9662103..9ed78e798 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -140,19 +140,19 @@ #include "scene/main/world.h" #include "scene/audio/audio_stream_sample.h" #include "core/scene/resources/bit_map.h" -#include "scene/resources/shapes/box_shape.h" -#include "scene/resources/shapes/capsule_shape.h" +#include "core/scene/resources/shapes/box_shape.h" +#include "core/scene/resources/shapes/capsule_shape.h" #include "scene/resources/shapes_2d/capsule_shape_2d.h" #include "scene/resources/shapes_2d/circle_shape_2d.h" -#include "scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" #include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "scene/resources/shapes/convex_polygon_shape.h" +#include "core/scene/resources/shapes/convex_polygon_shape.h" #include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" -#include "scene/resources/shapes/cylinder_shape.h" +#include "core/scene/resources/shapes/cylinder_shape.h" #include "scene/resources/default_theme/default_theme.h" #include "scene/resources/font/dynamic_font.h" #include "scene/resources/gradient.h" -#include "scene/resources/shapes/height_map_shape.h" +#include "core/scene/resources/shapes/height_map_shape.h" #include "scene/resources/mesh/immediate_mesh.h" #include "scene/resources/shapes_2d/line_shape_2d.h" #include "scene/resources/material/material.h" @@ -166,16 +166,16 @@ #include "scene/resources/packed_scene.h" #include "scene/resources/material/particles_material.h" #include "scene/resources/physics_material.h" -#include "scene/resources/shapes/plane_shape.h" +#include "core/scene/resources/shapes/plane_shape.h" #include "scene/resources/mesh/polygon_path_finder.h" #include "scene/resources/mesh/primitive_meshes.h" -#include "scene/resources/shapes/ray_shape.h" +#include "core/scene/resources/shapes/ray_shape.h" #include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "scene/resources/resource_format_text.h" #include "scene/resources/shapes_2d/segment_shape_2d.h" #include "scene/resources/sky.h" -#include "scene/resources/shapes/sphere_shape.h" +#include "core/scene/resources/shapes/sphere_shape.h" #include "scene/resources/mesh/surface_tool.h" #include "scene/gui/resources/syntax_highlighter.h" #include "scene/resources/text_file.h" diff --git a/scene/resources/SCsub b/scene/resources/SCsub index 45e45c171..2a56393be 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -25,13 +25,6 @@ env.add_source_files(shapes_2d_obj, "shapes_2d/*.cpp") for o in shapes_2d_obj: scene_obj.append(o) -# 3d shapes -shapes_3d_obj = [] -env.add_source_files(shapes_3d_obj, "shapes/*.cpp") - -for o in shapes_3d_obj: - scene_obj.append(o) - # 2d navigation navigation_2d_obj = [] env.add_source_files(navigation_2d_obj, "navigation_2d/*.cpp") diff --git a/scene/resources/mesh/importer_mesh.h b/scene/resources/mesh/importer_mesh.h index 2a6bab58f..66d0cfc38 100644 --- a/scene/resources/mesh/importer_mesh.h +++ b/scene/resources/mesh/importer_mesh.h @@ -33,8 +33,8 @@ #include "core/object/resource.h" #include "core/containers/local_vector.h" -#include "scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/shapes/convex_polygon_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/convex_polygon_shape.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/navigation/navigation_mesh.h" diff --git a/scene/resources/mesh/mesh.cpp b/scene/resources/mesh/mesh.cpp index 314379ea9..7f4a7a353 100644 --- a/scene/resources/mesh/mesh.cpp +++ b/scene/resources/mesh/mesh.cpp @@ -34,8 +34,8 @@ #include "core/containers/local_vector.h" #include "core/math/convex_hull.h" #include "core/containers/pair.h" -#include "scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/shapes/convex_polygon_shape.h" +#include "core/scene/resources/shapes/concave_polygon_shape.h" +#include "core/scene/resources/shapes/convex_polygon_shape.h" #include "surface_tool.h" #include diff --git a/scene/resources/mesh/mesh.h b/scene/resources/mesh/mesh.h index 2696364bc..8b04b3af9 100644 --- a/scene/resources/mesh/mesh.h +++ b/scene/resources/mesh/mesh.h @@ -35,7 +35,7 @@ #include "core/object/resource.h" #include "scene/resources/material/material.h" -#include "scene/resources/shapes/shape.h" +#include "core/scene/resources/shapes/shape.h" #include "core/servers/rendering/rendering_server.h" class Mesh : public Resource {