diff --git a/core/scene/SCsub b/core/scene/SCsub index 5dca0accb..95eb3d831 100644 --- a/core/scene/SCsub +++ b/core/scene/SCsub @@ -4,4 +4,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, "resources/shapes_2d/*.cpp") #env.add_source_files(env.core_sources, "*.cpp") diff --git a/scene/resources/shapes_2d/capsule_shape_2d.cpp b/core/scene/resources/shapes_2d/capsule_shape_2d.cpp similarity index 100% rename from scene/resources/shapes_2d/capsule_shape_2d.cpp rename to core/scene/resources/shapes_2d/capsule_shape_2d.cpp diff --git a/scene/resources/shapes_2d/capsule_shape_2d.h b/core/scene/resources/shapes_2d/capsule_shape_2d.h similarity index 98% rename from scene/resources/shapes_2d/capsule_shape_2d.h rename to core/scene/resources/shapes_2d/capsule_shape_2d.h index e09b4e081..da258de3d 100644 --- a/scene/resources/shapes_2d/capsule_shape_2d.h +++ b/core/scene/resources/shapes_2d/capsule_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" class CapsuleShape2D : public Shape2D { GDCLASS(CapsuleShape2D, Shape2D); diff --git a/scene/resources/shapes_2d/circle_shape_2d.cpp b/core/scene/resources/shapes_2d/circle_shape_2d.cpp similarity index 100% rename from scene/resources/shapes_2d/circle_shape_2d.cpp rename to core/scene/resources/shapes_2d/circle_shape_2d.cpp diff --git a/scene/resources/shapes_2d/circle_shape_2d.h b/core/scene/resources/shapes_2d/circle_shape_2d.h similarity index 98% rename from scene/resources/shapes_2d/circle_shape_2d.h rename to core/scene/resources/shapes_2d/circle_shape_2d.h index d5a64e2ca..9e95b219c 100644 --- a/scene/resources/shapes_2d/circle_shape_2d.h +++ b/core/scene/resources/shapes_2d/circle_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" class CircleShape2D : public Shape2D { GDCLASS(CircleShape2D, Shape2D); diff --git a/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp b/core/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp similarity index 100% rename from scene/resources/shapes_2d/concave_polygon_shape_2d.cpp rename to core/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp diff --git a/scene/resources/shapes_2d/concave_polygon_shape_2d.h b/core/scene/resources/shapes_2d/concave_polygon_shape_2d.h similarity index 98% rename from scene/resources/shapes_2d/concave_polygon_shape_2d.h rename to core/scene/resources/shapes_2d/concave_polygon_shape_2d.h index 85bf03fc5..0a558a6ac 100644 --- a/scene/resources/shapes_2d/concave_polygon_shape_2d.h +++ b/core/scene/resources/shapes_2d/concave_polygon_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" class ConcavePolygonShape2D : public Shape2D { GDCLASS(ConcavePolygonShape2D, Shape2D); diff --git a/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp b/core/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp similarity index 100% rename from scene/resources/shapes_2d/convex_polygon_shape_2d.cpp rename to core/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp diff --git a/scene/resources/shapes_2d/convex_polygon_shape_2d.h b/core/scene/resources/shapes_2d/convex_polygon_shape_2d.h similarity index 98% rename from scene/resources/shapes_2d/convex_polygon_shape_2d.h rename to core/scene/resources/shapes_2d/convex_polygon_shape_2d.h index 5abf2c1ad..23d1c8db0 100644 --- a/scene/resources/shapes_2d/convex_polygon_shape_2d.h +++ b/core/scene/resources/shapes_2d/convex_polygon_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" class ConvexPolygonShape2D : public Shape2D { GDCLASS(ConvexPolygonShape2D, Shape2D); diff --git a/scene/resources/shapes_2d/line_shape_2d.cpp b/core/scene/resources/shapes_2d/line_shape_2d.cpp similarity index 100% rename from scene/resources/shapes_2d/line_shape_2d.cpp rename to core/scene/resources/shapes_2d/line_shape_2d.cpp diff --git a/scene/resources/shapes_2d/line_shape_2d.h b/core/scene/resources/shapes_2d/line_shape_2d.h similarity index 98% rename from scene/resources/shapes_2d/line_shape_2d.h rename to core/scene/resources/shapes_2d/line_shape_2d.h index ace327405..535785853 100644 --- a/scene/resources/shapes_2d/line_shape_2d.h +++ b/core/scene/resources/shapes_2d/line_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" class LineShape2D : public Shape2D { GDCLASS(LineShape2D, Shape2D); diff --git a/scene/resources/shapes_2d/rectangle_shape_2d.cpp b/core/scene/resources/shapes_2d/rectangle_shape_2d.cpp similarity index 100% rename from scene/resources/shapes_2d/rectangle_shape_2d.cpp rename to core/scene/resources/shapes_2d/rectangle_shape_2d.cpp diff --git a/scene/resources/shapes_2d/rectangle_shape_2d.h b/core/scene/resources/shapes_2d/rectangle_shape_2d.h similarity index 98% rename from scene/resources/shapes_2d/rectangle_shape_2d.h rename to core/scene/resources/shapes_2d/rectangle_shape_2d.h index 3ad44f13e..ab66966bf 100644 --- a/scene/resources/shapes_2d/rectangle_shape_2d.h +++ b/core/scene/resources/shapes_2d/rectangle_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" class RectangleShape2D : public Shape2D { GDCLASS(RectangleShape2D, Shape2D); diff --git a/scene/resources/shapes_2d/segment_shape_2d.cpp b/core/scene/resources/shapes_2d/segment_shape_2d.cpp similarity index 100% rename from scene/resources/shapes_2d/segment_shape_2d.cpp rename to core/scene/resources/shapes_2d/segment_shape_2d.cpp diff --git a/scene/resources/shapes_2d/segment_shape_2d.h b/core/scene/resources/shapes_2d/segment_shape_2d.h similarity index 98% rename from scene/resources/shapes_2d/segment_shape_2d.h rename to core/scene/resources/shapes_2d/segment_shape_2d.h index 759c35acd..d4670fb22 100644 --- a/scene/resources/shapes_2d/segment_shape_2d.h +++ b/core/scene/resources/shapes_2d/segment_shape_2d.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" class SegmentShape2D : public Shape2D { GDCLASS(SegmentShape2D, Shape2D); diff --git a/scene/resources/shapes_2d/shape_2d.cpp b/core/scene/resources/shapes_2d/shape_2d.cpp similarity index 100% rename from scene/resources/shapes_2d/shape_2d.cpp rename to core/scene/resources/shapes_2d/shape_2d.cpp diff --git a/scene/resources/shapes_2d/shape_2d.h b/core/scene/resources/shapes_2d/shape_2d.h similarity index 100% rename from scene/resources/shapes_2d/shape_2d.h rename to core/scene/resources/shapes_2d/shape_2d.h diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp index 45e5c9d85..7d8e2fb8f 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.cpp +++ b/editor/plugins/collision_shape_2d_editor_plugin.cpp @@ -44,14 +44,14 @@ #include "scene/2d/collision_shape_2d.h" #include "scene/main/node.h" #include "scene/main/scene_tree.h" -#include "scene/resources/shapes_2d/capsule_shape_2d.h" -#include "scene/resources/shapes_2d/circle_shape_2d.h" -#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" -#include "scene/resources/shapes_2d/line_shape_2d.h" -#include "scene/resources/shapes_2d/rectangle_shape_2d.h" -#include "scene/resources/shapes_2d/segment_shape_2d.h" -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/capsule_shape_2d.h" +#include "core/scene/resources/shapes_2d/circle_shape_2d.h" +#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/line_shape_2d.h" +#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "core/scene/resources/shapes_2d/segment_shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/texture.h" void CollisionShape2DEditor::_node_removed(Node *p_node) { diff --git a/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp b/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp index 68331a743..974c98ba5 100644 --- a/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp +++ b/modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp @@ -33,12 +33,12 @@ #include "core/math/convex_hull.h" #include "scene/2d/mesh_instance_2d.h" #include "scene/2d/physics_body_2d.h" -#include "scene/resources/shapes_2d/capsule_shape_2d.h" -#include "scene/resources/shapes_2d/circle_shape_2d.h" -#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" -#include "scene/resources/shapes_2d/rectangle_shape_2d.h" -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/capsule_shape_2d.h" +#include "core/scene/resources/shapes_2d/circle_shape_2d.h" +#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_polygon.h" diff --git a/modules/props_2d/prop_2d_instance_merger.h b/modules/props_2d/prop_2d_instance_merger.h index 2593b977d..3f22bb63a 100644 --- a/modules/props_2d/prop_2d_instance_merger.h +++ b/modules/props_2d/prop_2d_instance_merger.h @@ -25,7 +25,7 @@ SOFTWARE. #include "prop_2d_instance.h" #include "scene/main/node_2d.h" -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" #include "core/math/vector3.h" diff --git a/modules/props_2d/prop_2d_instance_prop_job.h b/modules/props_2d/prop_2d_instance_prop_job.h index 1121aa61a..94a6e1195 100644 --- a/modules/props_2d/prop_2d_instance_prop_job.h +++ b/modules/props_2d/prop_2d_instance_prop_job.h @@ -24,7 +24,7 @@ SOFTWARE. #include "prop_2d_instance_job.h" -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.cpp b/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.cpp index d77e02826..3cdcb997d 100644 --- a/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.cpp +++ b/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.cpp @@ -25,7 +25,7 @@ SOFTWARE. #include "core/math/math_funcs.h" #include "../../library/terrain_2d_material_cache.h" -#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" void Terrain2DMesherIsometric::_add_chunk(Ref p_chunk) { Ref chunk = p_chunk; diff --git a/modules/terraman_2d/meshers/terrain_2d_mesher.cpp b/modules/terraman_2d/meshers/terrain_2d_mesher.cpp index 773ea2e97..c06051786 100644 --- a/modules/terraman_2d/meshers/terrain_2d_mesher.cpp +++ b/modules/terraman_2d/meshers/terrain_2d_mesher.cpp @@ -28,7 +28,7 @@ SOFTWARE. #include "../world/default/terrain_2d_chunk_default.h" #include "../world/terrain_2d_chunk.h" -#include "scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" #include "core/servers/physics_2d/physics_2d_server.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/terraman_2d/meshers/terrain_2d_mesher.h b/modules/terraman_2d/meshers/terrain_2d_mesher.h index 4afc8af02..2815d2619 100644 --- a/modules/terraman_2d/meshers/terrain_2d_mesher.h +++ b/modules/terraman_2d/meshers/terrain_2d_mesher.h @@ -44,7 +44,7 @@ SOFTWARE. #include "../../mesh_data_resource/mesh_data_resource.h" #endif -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" #include "../library/terrain_2d_library.h" diff --git a/modules/terraman_2d/world/terrain_2d_chunk.h b/modules/terraman_2d/world/terrain_2d_chunk.h index 11fb5992e..94968b83e 100644 --- a/modules/terraman_2d/world/terrain_2d_chunk.h +++ b/modules/terraman_2d/world/terrain_2d_chunk.h @@ -49,7 +49,7 @@ SOFTWARE. #include "../../props_2d/props/prop_2d_data.h" #endif -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" #include "../library/terrain_2d_library.h" #include "../library/terrain_2d_surface.h" diff --git a/modules/tile_map/tile_set.h b/modules/tile_map/tile_set.h index 7b7e73afc..442057235 100644 --- a/modules/tile_map/tile_set.h +++ b/modules/tile_map/tile_set.h @@ -36,9 +36,9 @@ #include "core/variant/array.h" #include "scene/2d/light_occluder_2d.h" #include "scene/2d/navigation_polygon_instance.h" -#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "scene/resources/navigation_2d/navigation_polygon.h" -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/texture.h" class TileSet : public Resource { diff --git a/modules/tile_map/tile_set_editor_plugin.h b/modules/tile_map/tile_set_editor_plugin.h index 643e27a5b..4a65f746d 100644 --- a/modules/tile_map/tile_set_editor_plugin.h +++ b/modules/tile_map/tile_set_editor_plugin.h @@ -32,8 +32,8 @@ #include "editor/editor_node.h" #include "scene/2d/sprite.h" -#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "tile_set.h" #define WORKSPACE_MARGIN Vector2(10, 10) diff --git a/scene/2d/collision_object_2d.h b/scene/2d/collision_object_2d.h index 0790bdb9b..c3fec8032 100644 --- a/scene/2d/collision_object_2d.h +++ b/scene/2d/collision_object_2d.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/main/node_2d.h" -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" class CollisionObject2D : public Node2D { GDCLASS(CollisionObject2D, Node2D); diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index ba5a94fae..37538d335 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -33,9 +33,9 @@ #include "collision_object_2d.h" #include "core/config/engine.h" #include "scene/2d/area_2d.h" -#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" #include "thirdparty/misc/triangulator.h" diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index 7f7366cef..1ec06d7b1 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -33,14 +33,14 @@ #include "collision_object_2d.h" #include "core/config/engine.h" #include "scene/2d/area_2d.h" -#include "scene/resources/shapes_2d/capsule_shape_2d.h" -#include "scene/resources/shapes_2d/circle_shape_2d.h" -#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" -#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" -#include "scene/resources/shapes_2d/line_shape_2d.h" -#include "scene/resources/shapes_2d/rectangle_shape_2d.h" -#include "scene/resources/shapes_2d/segment_shape_2d.h" -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/capsule_shape_2d.h" +#include "core/scene/resources/shapes_2d/circle_shape_2d.h" +#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/line_shape_2d.h" +#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "core/scene/resources/shapes_2d/segment_shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" void CollisionShape2D::_shape_changed() { update(); diff --git a/scene/2d/shape_cast_2d.cpp b/scene/2d/shape_cast_2d.cpp index 8c3b26420..1f22c601b 100644 --- a/scene/2d/shape_cast_2d.cpp +++ b/scene/2d/shape_cast_2d.cpp @@ -34,7 +34,7 @@ #include "core/config/engine.h" #include "scene/2d/collision_object_2d.h" #include "scene/2d/physics_body_2d.h" -#include "scene/resources/shapes_2d/circle_shape_2d.h" +#include "core/scene/resources/shapes_2d/circle_shape_2d.h" #include "core/servers/physics_2d/physics_2d_server.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 f551fb42f..a1f7dd936 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/main/node_2d.h" -#include "scene/resources/shapes_2d/shape_2d.h" +#include "core/scene/resources/shapes_2d/shape_2d.h" #include "scene/resources/world_2d.h" class CollisionObject2D; diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp index f04394300..16ffa61fa 100644 --- a/scene/2d/touch_screen_button.cpp +++ b/scene/2d/touch_screen_button.cpp @@ -34,7 +34,7 @@ #include "core/input/input.h" #include "core/os/os.h" #include "core/scene/resources/bit_map.h" -#include "scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "core/scene/resources/shapes_2d/rectangle_shape_2d.h" #include "scene/resources/texture.h" #include "scene/main/scene_string_names.h" diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 9ed78e798..a00129a42 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -142,19 +142,19 @@ #include "core/scene/resources/bit_map.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 "core/scene/resources/shapes_2d/capsule_shape_2d.h" +#include "core/scene/resources/shapes_2d/circle_shape_2d.h" #include "core/scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h" #include "core/scene/resources/shapes/convex_polygon_shape.h" -#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" +#include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.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 "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 "core/scene/resources/shapes_2d/line_shape_2d.h" #include "scene/resources/material/material.h" #include "scene/resources/mesh/mesh.h" #include "scene/resources/mesh/mesh_data_tool.h" @@ -170,9 +170,9 @@ #include "scene/resources/mesh/polygon_path_finder.h" #include "scene/resources/mesh/primitive_meshes.h" #include "core/scene/resources/shapes/ray_shape.h" -#include "scene/resources/shapes_2d/rectangle_shape_2d.h" +#include "core/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 "core/scene/resources/shapes_2d/segment_shape_2d.h" #include "scene/resources/sky.h" #include "core/scene/resources/shapes/sphere_shape.h" diff --git a/scene/resources/SCsub b/scene/resources/SCsub index 2a56393be..914d8721a 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -18,13 +18,6 @@ env.scene_sources += thirdparty_obj scene_obj = [] env.add_source_files(scene_obj, "*.cpp") -# 2d shapes -shapes_2d_obj = [] -env.add_source_files(shapes_2d_obj, "shapes_2d/*.cpp") - -for o in shapes_2d_obj: - scene_obj.append(o) - # 2d navigation navigation_2d_obj = [] env.add_source_files(navigation_2d_obj, "navigation_2d/*.cpp")