From 1cb531ddb6fedb5bed432eeaa17793a9e07f61ac Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Tue, 16 Mar 2021 02:27:53 -0400 Subject: Move 2D-only resources to their own folder --- scene/register_scene_types.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'scene/register_scene_types.cpp') diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 035c6c0695..77a331f52c 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -139,6 +139,25 @@ #include "scene/main/timer.h" #include "scene/main/viewport.h" #include "scene/main/window.h" +#include "scene/resources/2d/capsule_shape_2d.h" +#include "scene/resources/2d/circle_shape_2d.h" +#include "scene/resources/2d/concave_polygon_shape_2d.h" +#include "scene/resources/2d/convex_polygon_shape_2d.h" +#include "scene/resources/2d/polygon_path_finder.h" +#include "scene/resources/2d/rectangle_shape_2d.h" +#include "scene/resources/2d/segment_shape_2d.h" +#include "scene/resources/2d/separation_ray_shape_2d.h" +#include "scene/resources/2d/skeleton/skeleton_modification_2d.h" +#include "scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h" +#include "scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h" +#include "scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h" +#include "scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h" +#include "scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h" +#include "scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h" +#include "scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h" +#include "scene/resources/2d/skeleton/skeleton_modification_stack_2d.h" +#include "scene/resources/2d/tile_set.h" +#include "scene/resources/2d/world_boundary_shape_2d.h" #include "scene/resources/animated_texture.h" #include "scene/resources/animation_library.h" #include "scene/resources/atlas_texture.h" @@ -148,12 +167,8 @@ #include "scene/resources/bone_map.h" #include "scene/resources/camera_attributes.h" #include "scene/resources/camera_texture.h" -#include "scene/resources/capsule_shape_2d.h" -#include "scene/resources/circle_shape_2d.h" #include "scene/resources/compositor.h" #include "scene/resources/compressed_texture.h" -#include "scene/resources/concave_polygon_shape_2d.h" -#include "scene/resources/convex_polygon_shape_2d.h" #include "scene/resources/curve_texture.h" #include "scene/resources/environment.h" #include "scene/resources/font.h" @@ -174,22 +189,9 @@ #include "scene/resources/particle_process_material.h" #include "scene/resources/physics_material.h" #include "scene/resources/placeholder_textures.h" -#include "scene/resources/polygon_path_finder.h" #include "scene/resources/portable_compressed_texture.h" -#include "scene/resources/rectangle_shape_2d.h" #include "scene/resources/resource_format_text.h" -#include "scene/resources/segment_shape_2d.h" -#include "scene/resources/separation_ray_shape_2d.h" #include "scene/resources/shader_include.h" -#include "scene/resources/skeleton_modification_2d.h" -#include "scene/resources/skeleton_modification_2d_ccdik.h" -#include "scene/resources/skeleton_modification_2d_fabrik.h" -#include "scene/resources/skeleton_modification_2d_jiggle.h" -#include "scene/resources/skeleton_modification_2d_lookat.h" -#include "scene/resources/skeleton_modification_2d_physicalbones.h" -#include "scene/resources/skeleton_modification_2d_stackholder.h" -#include "scene/resources/skeleton_modification_2d_twoboneik.h" -#include "scene/resources/skeleton_modification_stack_2d.h" #include "scene/resources/skeleton_profile.h" #include "scene/resources/sky.h" #include "scene/resources/sky_material.h" @@ -205,14 +207,12 @@ #include "scene/resources/texture.h" #include "scene/resources/texture_rd.h" #include "scene/resources/theme.h" -#include "scene/resources/tile_set.h" #include "scene/resources/video_stream.h" #include "scene/resources/visual_shader.h" #include "scene/resources/visual_shader_nodes.h" #include "scene/resources/visual_shader_particle_nodes.h" #include "scene/resources/visual_shader_sdf_nodes.h" #include "scene/resources/world_2d.h" -#include "scene/resources/world_boundary_shape_2d.h" #include "scene/scene_string_names.h" #include "scene/theme/theme_db.h" -- cgit v1.2.3 From c399424db9ee39e94cd21569ee87567de10586e2 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Fri, 13 Aug 2021 11:42:45 -0500 Subject: Move 3D-only resources to their own folder --- scene/register_scene_types.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'scene/register_scene_types.cpp') diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 77a331f52c..b156cd0422 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; -- cgit v1.2.3