diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index a1c30f2b2..6765847aa 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -64,7 +64,7 @@ #include "scene/gui/texture_rect.h" #include "scene/main/node.h" #include "scene/main/viewport.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/shader.h" #include "scene/resources/style_box.h" #include "scene/resources/texture.h" diff --git a/editor/plugins/collision_polygon_editor_plugin.cpp b/editor/plugins/collision_polygon_editor_plugin.cpp index 59852939c..d5f4b8bd1 100644 --- a/editor/plugins/collision_polygon_editor_plugin.cpp +++ b/editor/plugins/collision_polygon_editor_plugin.cpp @@ -61,7 +61,7 @@ #include "scene/gui/tool_button.h" #include "scene/main/node.h" #include "scene/main/scene_tree.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "scene/resources/texture.h" diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index aa363282b..68326df1e 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -36,7 +36,7 @@ #include "editor/editor_scale.h" #include "scene/resources/bit_map.h" #include "scene/resources/font/dynamic_font.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "servers/audio/audio_stream.h" #include "core/config/project_settings.h" diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index 6a7429478..b99f07b38 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -35,7 +35,7 @@ #include "scene/gui/viewport_container.h" #include "scene/main/viewport.h" #include "scene/resources/environment_3d.h" -#include "scene/resources/particles_material.h" +#include "scene/resources/material/particles_material.h" #include "scene/resources/sky.h" #include "scene/resources/world_3d.h" #include "core/object/class_db.h" diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index f59401cb6..8b75231dd 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/plugins/material_editor_plugin.h @@ -37,7 +37,7 @@ #include "scene/resources/primitive_meshes.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "core/object/object.h" #include "core/object/reference.h" #include "core/string/ustring.h" diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h index 1cad6a91a..b40e97621 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/plugins/mesh_editor_plugin.h @@ -38,7 +38,7 @@ #include "core/object/reference.h" #include "core/string/ustring.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" class Camera; diff --git a/editor/plugins/path_editor_plugin.cpp b/editor/plugins/path_editor_plugin.cpp index 142e7c4e4..b4cd80738 100644 --- a/editor/plugins/path_editor_plugin.cpp +++ b/editor/plugins/path_editor_plugin.cpp @@ -55,7 +55,7 @@ #include "scene/gui/tool_button.h" #include "scene/main/node.h" #include "scene/resources/curve.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "spatial_editor_plugin.h" String PathSpatialGizmo::get_handle_name(int p_id, bool p_secondary) const { diff --git a/editor/plugins/room_manager_editor_plugin.h b/editor/plugins/room_manager_editor_plugin.h index 7a338b1a8..d9ccc8630 100644 --- a/editor/plugins/room_manager_editor_plugin.h +++ b/editor/plugins/room_manager_editor_plugin.h @@ -32,7 +32,7 @@ #include "editor/editor_plugin.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "core/object/object.h" #include "core/string/ustring.h" diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 2db6583a3..7b8023c70 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -61,7 +61,7 @@ #include "editor/spatial_editor_gizmos.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "scene/resources/texture.h" diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index 78afa658e..64416b9ad 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -92,7 +92,7 @@ #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/material.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" diff --git a/editor_modules/gltf/gltf_document.h b/editor_modules/gltf/gltf_document.h index 686b02fa9..ac18b34b1 100644 --- a/editor_modules/gltf/gltf_document.h +++ b/editor_modules/gltf/gltf_document.h @@ -35,7 +35,7 @@ #include "scene/3d/mesh_instance.h" #include "scene/3d/spatial.h" #include "scene/animation/animation_player.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/texture.h" #include "extensions/gltf_document_extension.h" diff --git a/modules/csg/csg.h b/modules/csg/csg.h index d352c7011..812a9d281 100644 --- a/modules/csg/csg.h +++ b/modules/csg/csg.h @@ -42,7 +42,7 @@ #include "core/containers/pool_vector.h" #include "core/object/reference.h" #include "core/containers/vector.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" struct CSGBrush { diff --git a/modules/entity_spell_system/material_cache/ess_material_cache.h b/modules/entity_spell_system/material_cache/ess_material_cache.h index 0c0ff6bf6..1635ae71a 100644 --- a/modules/entity_spell_system/material_cache/ess_material_cache.h +++ b/modules/entity_spell_system/material_cache/ess_material_cache.h @@ -28,7 +28,7 @@ SOFTWARE. #include "core/math/rect2.h" #include "core/os/mutex.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h b/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h index 1db3b495d..5a9db9a34 100644 --- a/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h +++ b/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h @@ -29,7 +29,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" class TexturePacker; class PropData; diff --git a/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.cpp b/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.cpp index 7ab3bc51b..5179961b3 100644 --- a/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.cpp +++ b/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.cpp @@ -16,7 +16,7 @@ #include "scene/gui/label.h" #include "scene/gui/option_button.h" #include "scene/gui/texture_rect.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" MMGraphNode *MMGradientEditor::get_graph_node() { return graph_node; diff --git a/modules/mesh_data_resource/props/prop_data_mesh_data.cpp b/modules/mesh_data_resource/props/prop_data_mesh_data.cpp index 2531b2433..6cc78106f 100644 --- a/modules/mesh_data_resource/props/prop_data_mesh_data.cpp +++ b/modules/mesh_data_resource/props/prop_data_mesh_data.cpp @@ -27,7 +27,7 @@ SOFTWARE. #ifdef MODULE_PROPS_ENABLED #include "../nodes/mesh_data_instance.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" Ref PropDataMeshData::get_mesh() const { return _mesh; diff --git a/modules/mesh_data_resource/props_2d/prop_2d_data_mesh_data.cpp b/modules/mesh_data_resource/props_2d/prop_2d_data_mesh_data.cpp index be5de556b..c91a43fb0 100644 --- a/modules/mesh_data_resource/props_2d/prop_2d_data_mesh_data.cpp +++ b/modules/mesh_data_resource/props_2d/prop_2d_data_mesh_data.cpp @@ -27,7 +27,7 @@ SOFTWARE. #ifdef MODULE_PROPS_2D_ENABLED #include "../nodes/mesh_data_instance.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" Ref Prop2DDataMeshData::get_mesh() const { return _mesh; diff --git a/modules/mesh_utils/mesh_merger.h b/modules/mesh_utils/mesh_merger.h index e786b38e5..f331dc91c 100644 --- a/modules/mesh_utils/mesh_merger.h +++ b/modules/mesh_utils/mesh_merger.h @@ -37,7 +37,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" #include "scene/main/node.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/props/material_cache/prop_material_cache.h b/modules/props/material_cache/prop_material_cache.h index 55595d21e..acb9cc365 100644 --- a/modules/props/material_cache/prop_material_cache.h +++ b/modules/props/material_cache/prop_material_cache.h @@ -28,7 +28,7 @@ SOFTWARE. #include "core/math/rect2.h" #include "core/os/mutex.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" class PropData; diff --git a/modules/props/material_cache/prop_material_cache_pcm.h b/modules/props/material_cache/prop_material_cache_pcm.h index de6bb8799..48d66865d 100644 --- a/modules/props/material_cache/prop_material_cache_pcm.h +++ b/modules/props/material_cache/prop_material_cache_pcm.h @@ -29,7 +29,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" class TexturePacker; class PropData; diff --git a/modules/props/prop_instance.h b/modules/props/prop_instance.h index 1c351c248..8bc970a3b 100644 --- a/modules/props/prop_instance.h +++ b/modules/props/prop_instance.h @@ -24,7 +24,7 @@ SOFTWARE. #include "scene/3d/spatial.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "core/math/vector3.h" diff --git a/modules/props/prop_mesher.h b/modules/props/prop_mesher.h index 53b7ec92c..89426ec12 100644 --- a/modules/props/prop_mesher.h +++ b/modules/props/prop_mesher.h @@ -32,7 +32,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" #include "scene/main/node.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/props/singleton/prop_cache.h b/modules/props/singleton/prop_cache.h index 7e68382ba..fb5651bae 100644 --- a/modules/props/singleton/prop_cache.h +++ b/modules/props/singleton/prop_cache.h @@ -29,7 +29,7 @@ SOFTWARE. #include "core/object/reference.h" #include "core/containers/vector.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "core/os/mutex.h" diff --git a/modules/props/tiled_wall/tiled_wall_data.h b/modules/props/tiled_wall/tiled_wall_data.h index 1c01895ee..dd987a241 100644 --- a/modules/props/tiled_wall/tiled_wall_data.h +++ b/modules/props/tiled_wall/tiled_wall_data.h @@ -30,7 +30,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/texture.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/props_2d/material_cache/prop_2d_material_cache.h b/modules/props_2d/material_cache/prop_2d_material_cache.h index 06435b319..761674d67 100644 --- a/modules/props_2d/material_cache/prop_2d_material_cache.h +++ b/modules/props_2d/material_cache/prop_2d_material_cache.h @@ -28,7 +28,7 @@ SOFTWARE. #include "core/math/rect2.h" #include "core/os/mutex.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" class Prop2DData; diff --git a/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h b/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h index 0486f3d35..8418c0fc7 100644 --- a/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h +++ b/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h @@ -29,7 +29,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" class TexturePacker; class Prop2DData; diff --git a/modules/props_2d/prop_2d_instance.h b/modules/props_2d/prop_2d_instance.h index 3fc6a9729..8891cac12 100644 --- a/modules/props_2d/prop_2d_instance.h +++ b/modules/props_2d/prop_2d_instance.h @@ -24,7 +24,7 @@ SOFTWARE. #include "scene/2d/node_2d.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "core/math/vector3.h" diff --git a/modules/props_2d/prop_2d_mesher.h b/modules/props_2d/prop_2d_mesher.h index e79fdf093..c4066b6a9 100644 --- a/modules/props_2d/prop_2d_mesher.h +++ b/modules/props_2d/prop_2d_mesher.h @@ -32,7 +32,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" #include "scene/main/node.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/props_2d/props/prop_2d_data_entry.h b/modules/props_2d/props/prop_2d_data_entry.h index 6ec5f7955..e53949c2c 100644 --- a/modules/props_2d/props/prop_2d_data_entry.h +++ b/modules/props_2d/props/prop_2d_data_entry.h @@ -26,7 +26,7 @@ SOFTWARE. #include "core/math/transform_2d.h" #include "core/object/resource.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/props_2d/singleton/prop_2d_cache.h b/modules/props_2d/singleton/prop_2d_cache.h index 78e2ad2e0..615aeb3a9 100644 --- a/modules/props_2d/singleton/prop_2d_cache.h +++ b/modules/props_2d/singleton/prop_2d_cache.h @@ -29,7 +29,7 @@ SOFTWARE. #include "core/object/reference.h" #include "core/containers/vector.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "core/os/mutex.h" diff --git a/modules/props_2d/tiled_wall/tiled_wall_2d_data.h b/modules/props_2d/tiled_wall/tiled_wall_2d_data.h index 330b95b27..7d34c6fb2 100644 --- a/modules/props_2d/tiled_wall/tiled_wall_2d_data.h +++ b/modules/props_2d/tiled_wall/tiled_wall_2d_data.h @@ -30,7 +30,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/texture.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/terraman/library/terrain_library.h b/modules/terraman/library/terrain_library.h index b96eed360..abb846c2f 100644 --- a/modules/terraman/library/terrain_library.h +++ b/modules/terraman/library/terrain_library.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/object/resource.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/terrain_light.h" #include "terrain_surface.h" diff --git a/modules/terraman/library/terrain_library_merger.h b/modules/terraman/library/terrain_library_merger.h index 38cd81283..a1418d760 100644 --- a/modules/terraman/library/terrain_library_merger.h +++ b/modules/terraman/library/terrain_library_merger.h @@ -27,7 +27,7 @@ SOFTWARE. #include "terrain_library.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/terrain_light.h" #include "terrain_surface_merger.h" diff --git a/modules/terraman/library/terrain_library_merger_pcm.h b/modules/terraman/library/terrain_library_merger_pcm.h index c629cb112..ac5553db2 100644 --- a/modules/terraman/library/terrain_library_merger_pcm.h +++ b/modules/terraman/library/terrain_library_merger_pcm.h @@ -27,7 +27,7 @@ SOFTWARE. #include "terrain_library.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/terrain_light.h" #include "terrain_surface_merger.h" diff --git a/modules/terraman/library/terrain_library_simple.h b/modules/terraman/library/terrain_library_simple.h index 45b786079..086aaf074 100644 --- a/modules/terraman/library/terrain_library_simple.h +++ b/modules/terraman/library/terrain_library_simple.h @@ -26,7 +26,7 @@ SOFTWARE. #include "terrain_library.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/terrain_light.h" #include "terrain_surface_simple.h" diff --git a/modules/terraman/library/terrain_material_cache.h b/modules/terraman/library/terrain_material_cache.h index ce4993d7f..6364b0acd 100644 --- a/modules/terraman/library/terrain_material_cache.h +++ b/modules/terraman/library/terrain_material_cache.h @@ -27,7 +27,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "terrain_library.h" diff --git a/modules/terraman/library/terrain_material_cache_pcm.h b/modules/terraman/library/terrain_material_cache_pcm.h index 30de29327..17d98d8be 100644 --- a/modules/terraman/library/terrain_material_cache_pcm.h +++ b/modules/terraman/library/terrain_material_cache_pcm.h @@ -29,7 +29,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../defines.h" diff --git a/modules/terraman/library/terrain_surface.h b/modules/terraman/library/terrain_surface.h index 079cffc40..d1578f6a7 100644 --- a/modules/terraman/library/terrain_surface.h +++ b/modules/terraman/library/terrain_surface.h @@ -27,7 +27,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "terrain_library.h" diff --git a/modules/terraman/meshers/terrain_mesher.h b/modules/terraman/meshers/terrain_mesher.h index da6991e46..056b3b9ba 100644 --- a/modules/terraman/meshers/terrain_mesher.h +++ b/modules/terraman/meshers/terrain_mesher.h @@ -36,7 +36,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" #include "scene/main/node.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/terraman_2d/library/terrain_2d_library.h b/modules/terraman_2d/library/terrain_2d_library.h index afafb6e10..243113b67 100644 --- a/modules/terraman_2d/library/terrain_2d_library.h +++ b/modules/terraman_2d/library/terrain_2d_library.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/object/resource.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/terrain_2d_light.h" #include "terrain_2d_surface.h" diff --git a/modules/terraman_2d/library/terrain_2d_library_merger.h b/modules/terraman_2d/library/terrain_2d_library_merger.h index 47cf57f43..333efe709 100644 --- a/modules/terraman_2d/library/terrain_2d_library_merger.h +++ b/modules/terraman_2d/library/terrain_2d_library_merger.h @@ -27,7 +27,7 @@ SOFTWARE. #include "terrain_2d_library.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/terrain_2d_light.h" #include "terrain_2d_surface_merger.h" diff --git a/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h b/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h index b1423a896..0f9c5deaf 100644 --- a/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h +++ b/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h @@ -27,7 +27,7 @@ SOFTWARE. #include "terrain_2d_library.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/terrain_2d_light.h" #include "terrain_2d_surface_merger.h" diff --git a/modules/terraman_2d/library/terrain_2d_library_simple.h b/modules/terraman_2d/library/terrain_2d_library_simple.h index 8150308a8..41e198fdc 100644 --- a/modules/terraman_2d/library/terrain_2d_library_simple.h +++ b/modules/terraman_2d/library/terrain_2d_library_simple.h @@ -26,7 +26,7 @@ SOFTWARE. #include "terrain_2d_library.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/terrain_2d_light.h" #include "terrain_2d_surface_simple.h" diff --git a/modules/terraman_2d/library/terrain_2d_material_cache.h b/modules/terraman_2d/library/terrain_2d_material_cache.h index 06145ba76..e8dddb14a 100644 --- a/modules/terraman_2d/library/terrain_2d_material_cache.h +++ b/modules/terraman_2d/library/terrain_2d_material_cache.h @@ -27,7 +27,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "terrain_2d_library.h" diff --git a/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h b/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h index 995204c21..119073d97 100644 --- a/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h +++ b/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h @@ -29,7 +29,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../defines.h" diff --git a/modules/terraman_2d/library/terrain_2d_surface.h b/modules/terraman_2d/library/terrain_2d_surface.h index 7478d641b..dd120894a 100644 --- a/modules/terraman_2d/library/terrain_2d_surface.h +++ b/modules/terraman_2d/library/terrain_2d_surface.h @@ -27,7 +27,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "terrain_2d_library.h" diff --git a/modules/terraman_2d/meshers/terrain_2d_mesher.h b/modules/terraman_2d/meshers/terrain_2d_mesher.h index 0875adc34..7997af1d2 100644 --- a/modules/terraman_2d/meshers/terrain_2d_mesher.h +++ b/modules/terraman_2d/meshers/terrain_2d_mesher.h @@ -35,7 +35,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" #include "scene/main/node.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "modules/modules_enabled.gen.h" diff --git a/modules/voxelman/library/voxel_library.h b/modules/voxelman/library/voxel_library.h index 6d6943464..6443e3da3 100644 --- a/modules/voxelman/library/voxel_library.h +++ b/modules/voxelman/library/voxel_library.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/object/resource.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/voxel_light.h" #include "voxel_surface.h" diff --git a/modules/voxelman/library/voxel_library_merger.h b/modules/voxelman/library/voxel_library_merger.h index 76e723481..59dd6af5c 100644 --- a/modules/voxelman/library/voxel_library_merger.h +++ b/modules/voxelman/library/voxel_library_merger.h @@ -27,7 +27,7 @@ SOFTWARE. #include "voxel_library.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/voxel_light.h" #include "voxel_surface_merger.h" diff --git a/modules/voxelman/library/voxel_library_merger_pcm.h b/modules/voxelman/library/voxel_library_merger_pcm.h index c241b9086..fb894546e 100644 --- a/modules/voxelman/library/voxel_library_merger_pcm.h +++ b/modules/voxelman/library/voxel_library_merger_pcm.h @@ -27,7 +27,7 @@ SOFTWARE. #include "voxel_library.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/voxel_light.h" #include "voxel_surface_merger.h" diff --git a/modules/voxelman/library/voxel_library_simple.h b/modules/voxelman/library/voxel_library_simple.h index 265aeaa61..8c0cdaff0 100644 --- a/modules/voxelman/library/voxel_library_simple.h +++ b/modules/voxelman/library/voxel_library_simple.h @@ -26,7 +26,7 @@ SOFTWARE. #include "voxel_library.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../data/voxel_light.h" #include "voxel_surface_simple.h" diff --git a/modules/voxelman/library/voxel_material_cache.h b/modules/voxelman/library/voxel_material_cache.h index b584aff6f..59be80bed 100644 --- a/modules/voxelman/library/voxel_material_cache.h +++ b/modules/voxelman/library/voxel_material_cache.h @@ -27,7 +27,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "voxel_library.h" diff --git a/modules/voxelman/library/voxel_material_cache_pcm.h b/modules/voxelman/library/voxel_material_cache_pcm.h index 9ccc86777..98cac2d5d 100644 --- a/modules/voxelman/library/voxel_material_cache_pcm.h +++ b/modules/voxelman/library/voxel_material_cache_pcm.h @@ -29,7 +29,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "../defines.h" diff --git a/modules/voxelman/library/voxel_surface.h b/modules/voxelman/library/voxel_surface.h index 92a4543c1..6e124859d 100644 --- a/modules/voxelman/library/voxel_surface.h +++ b/modules/voxelman/library/voxel_surface.h @@ -27,7 +27,7 @@ SOFTWARE. #include "core/containers/vector.h" #include "core/math/rect2.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "voxel_library.h" diff --git a/modules/voxelman/meshers/voxel_mesher.h b/modules/voxelman/meshers/voxel_mesher.h index a1e3135b6..9f7bca593 100644 --- a/modules/voxelman/meshers/voxel_mesher.h +++ b/modules/voxelman/meshers/voxel_mesher.h @@ -34,7 +34,7 @@ SOFTWARE. #include "core/math/vector2.h" #include "core/math/vector3.h" #include "scene/main/node.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "modules/modules_enabled.gen.h" diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h index 09e23a3dd..fd1eff6e1 100644 --- a/scene/2d/canvas_item.h +++ b/scene/2d/canvas_item.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "scene/main/node.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" class CanvasLayer; class Viewport; diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index 4cf8d85de..776a756b6 100644 --- a/scene/2d/cpu_particles_2d.cpp +++ b/scene/2d/cpu_particles_2d.cpp @@ -36,7 +36,7 @@ #include "core/math/transform_interpolator.h" #include "scene/2d/canvas_item.h" -#include "scene/resources/particles_material.h" +#include "scene/resources/material/particles_material.h" #include "scene/resources/texture.h" #include "servers/rendering_server.h" diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp index a81a2875b..f9df140e4 100644 --- a/scene/3d/camera.cpp +++ b/scene/3d/camera.cpp @@ -36,7 +36,7 @@ #include "scene/3d/spatial_velocity_tracker.h" #include "scene/main/viewport.h" #include "scene/resources/environment_3d.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/surface_tool.h" #include "scene/resources/world_3d.h" diff --git a/scene/3d/cpu_particles.cpp b/scene/3d/cpu_particles.cpp index 84c60eddf..9d323edb1 100644 --- a/scene/3d/cpu_particles.cpp +++ b/scene/3d/cpu_particles.cpp @@ -36,7 +36,7 @@ #include "scene/resources/curve.h" #include "scene/resources/gradient.h" #include "scene/resources/mesh.h" -#include "scene/resources/particles_material.h" +#include "scene/resources/material/particles_material.h" #include "servers/rendering_server.h" AABB CPUParticles::get_aabb() const { diff --git a/scene/3d/label_3d.h b/scene/3d/label_3d.h index c7d65cad0..eaae3ea92 100644 --- a/scene/3d/label_3d.h +++ b/scene/3d/label_3d.h @@ -33,7 +33,7 @@ #include "scene/3d/visual_instance.h" #include "scene/resources/font/font.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" class TriangleMesh; diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index dbe92bf95..3d88561a5 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -34,7 +34,7 @@ #include "core/config/project_settings.h" #include "core/core_string_names.h" #include "physics_body.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "scene/scene_string_names.h" #include "servers/rendering/rendering_server_globals.h" diff --git a/scene/3d/navigation_agent.cpp b/scene/3d/navigation_agent.cpp index f34edd51c..0baa68ffb 100644 --- a/scene/3d/navigation_agent.cpp +++ b/scene/3d/navigation_agent.cpp @@ -34,7 +34,7 @@ #include "core/math/geometry.h" #include "scene/3d/navigation.h" #include "scene/3d/navigation_link_3d.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "scene/resources/world_3d.h" #include "servers/navigation/navigation_path_query_result_3d.h" diff --git a/scene/3d/navigation_obstacle.cpp b/scene/3d/navigation_obstacle.cpp index 53df6c775..dcb6becdd 100644 --- a/scene/3d/navigation_obstacle.cpp +++ b/scene/3d/navigation_obstacle.cpp @@ -35,7 +35,7 @@ #include "scene/3d/navigation.h" #include "scene/3d/physics_body.h" #include "scene/3d/spatial.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "scene/resources/shapes/shape.h" #include "scene/resources/world_3d.h" diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp index fe54a9447..4537f2f83 100644 --- a/scene/3d/ray_cast.cpp +++ b/scene/3d/ray_cast.cpp @@ -33,7 +33,7 @@ #include "collision_object.h" #include "core/config/engine.h" #include "mesh_instance.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "scene/resources/world_3d.h" #include "servers/physics_server.h" diff --git a/scene/3d/shape_cast.cpp b/scene/3d/shape_cast.cpp index 5e5a8eb72..53e5de2eb 100644 --- a/scene/3d/shape_cast.cpp +++ b/scene/3d/shape_cast.cpp @@ -34,7 +34,7 @@ #include "core/config/engine.h" #include "mesh_instance.h" #include "scene/resources/shapes/concave_polygon_shape.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "scene/resources/world_3d.h" diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h index 6d6b628c2..ce5c0b9ac 100644 --- a/scene/3d/sprite_3d.h +++ b/scene/3d/sprite_3d.h @@ -32,7 +32,7 @@ #include "core/object/reference.h" #include "scene/3d/visual_instance.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" class TriangleMesh; class SpriteFrames; diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp index 17f7a32ba..fc8850092 100644 --- a/scene/3d/visual_instance.cpp +++ b/scene/3d/visual_instance.cpp @@ -30,7 +30,7 @@ #include "visual_instance.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/world_3d.h" #include "scene/scene_string_names.h" #include "servers/rendering_server.h" diff --git a/scene/animation/root_motion_view.cpp b/scene/animation/root_motion_view.cpp index 1e8ecb1e1..2ae3a2e3d 100644 --- a/scene/animation/root_motion_view.cpp +++ b/scene/animation/root_motion_view.cpp @@ -30,7 +30,7 @@ #include "root_motion_view.h" #include "scene/animation/animation_tree.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" void RootMotionView::set_animation_path(const NodePath &p_path) { path = p_path; first = true; diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 441d57fd1..337922d30 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -47,7 +47,7 @@ #include "scene/debugger/script_debugger_remote.h" #include "scene/gui/control.h" #include "scene/resources/font/dynamic_font.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "scene/resources/packed_scene.h" #include "scene/scene_string_names.h" diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index a08a697e7..ae2022fec 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -155,7 +155,7 @@ #include "scene/resources/shapes/height_map_shape.h" #include "scene/resources/immediate_mesh.h" #include "scene/resources/shapes_2d/line_shape_2d.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/mesh.h" #include "scene/resources/mesh_data_tool.h" #include "scene/resources/multimesh.h" @@ -164,7 +164,7 @@ #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation_2d/navigation_polygon.h" #include "scene/resources/packed_scene.h" -#include "scene/resources/particles_material.h" +#include "scene/resources/material/particles_material.h" #include "scene/resources/physics_material.h" #include "scene/resources/shapes/plane_shape.h" #include "scene/resources/polygon_path_finder.h" diff --git a/scene/resources/SCsub b/scene/resources/SCsub index 004ab6148..d19c28fa6 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -53,6 +53,14 @@ env.add_source_files(font_obj, "font/*.cpp") for o in font_obj: scene_obj.append(o) + +# material +material_obj = [] +env.add_source_files(material_obj, "material/*.cpp") + +for o in material_obj: + scene_obj.append(o) + env.scene_sources += scene_obj # Needed to force rebuilding the scene files when the thirdparty code is updated. diff --git a/scene/resources/material.cpp b/scene/resources/material/material.cpp similarity index 100% rename from scene/resources/material.cpp rename to scene/resources/material/material.cpp diff --git a/scene/resources/material.h b/scene/resources/material/material.h similarity index 100% rename from scene/resources/material.h rename to scene/resources/material/material.h diff --git a/scene/resources/particles_material.cpp b/scene/resources/material/particles_material.cpp similarity index 100% rename from scene/resources/particles_material.cpp rename to scene/resources/material/particles_material.cpp diff --git a/scene/resources/particles_material.h b/scene/resources/material/particles_material.h similarity index 99% rename from scene/resources/particles_material.h rename to scene/resources/material/particles_material.h index eea0d90b2..091030977 100644 --- a/scene/resources/particles_material.h +++ b/scene/resources/material/particles_material.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/containers/rid.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" class ParticlesMaterial : public Material { GDCLASS(ParticlesMaterial, Material); diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index a980f3473..df5d81252 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -34,7 +34,7 @@ #include "core/math/triangle_mesh.h" #include "core/object/resource.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #include "scene/resources/shapes/shape.h" #include "servers/rendering_server.h" diff --git a/servers/navigation_server.cpp b/servers/navigation_server.cpp index dd8eac8c8..d89a47dba 100644 --- a/servers/navigation_server.cpp +++ b/servers/navigation_server.cpp @@ -39,7 +39,7 @@ #ifdef DEBUG_ENABLED #include "core/config/engine.h" #include "core/config/project_settings.h" -#include "scene/resources/material.h" +#include "scene/resources/material/material.h" #endif NavigationServer *NavigationServer::singleton = nullptr;