From cda00a7b802184e0a3be6e53038d944cc5c723c9 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 7 Aug 2022 21:52:04 +0200 Subject: [PATCH] Fixed most includes. --- modules/gltf/extensions/gltf_light.h | 6 +++--- modules/gltf/extensions/gltf_spec_gloss.h | 4 ++-- modules/gltf/gltf_document.cpp | 15 ++++----------- modules/gltf/gltf_document.h | 8 +++----- ...f_document_extension_convert_importer_mesh.cpp | 2 +- ...ltf_document_extension_convert_importer_mesh.h | 2 +- modules/gltf/gltf_state.h | 2 +- modules/gltf/gltf_template_convert.h | 6 +++--- modules/gltf/register_types.cpp | 2 +- modules/gltf/structures/gltf_accessor.cpp | 4 ++-- modules/gltf/structures/gltf_accessor.h | 2 +- modules/gltf/structures/gltf_animation.h | 2 +- modules/gltf/structures/gltf_buffer_view.h | 2 +- modules/gltf/structures/gltf_camera.h | 2 +- modules/gltf/structures/gltf_mesh.h | 2 +- modules/gltf/structures/gltf_node.h | 2 +- modules/gltf/structures/gltf_skeleton.cpp | 2 +- modules/gltf/structures/gltf_skeleton.h | 2 +- modules/gltf/structures/gltf_skin.h | 2 +- modules/gltf/structures/gltf_texture.h | 2 +- 20 files changed, 31 insertions(+), 40 deletions(-) diff --git a/modules/gltf/extensions/gltf_light.h b/modules/gltf/extensions/gltf_light.h index 1aa727b6b..fbc4897c2 100644 --- a/modules/gltf/extensions/gltf_light.h +++ b/modules/gltf/extensions/gltf_light.h @@ -31,9 +31,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/config/engine.h" -#include "core/io/resource.h" -#include "scene/3d/light_3d.h" +#include "core/engine.h" +#include "core/resource.h" +#include "scene/3d/light.h" class GLTFLight : public Resource { GDCLASS(GLTFLight, Resource) diff --git a/modules/gltf/extensions/gltf_spec_gloss.h b/modules/gltf/extensions/gltf_spec_gloss.h index 7e217863c..b577e5ae1 100644 --- a/modules/gltf/extensions/gltf_spec_gloss.h +++ b/modules/gltf/extensions/gltf_spec_gloss.h @@ -31,8 +31,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/io/image.h" -#include "core/io/resource.h" +#include "core/image.h" +#include "core/resource.h" class GLTFSpecGloss : public Resource { GDCLASS(GLTFSpecGloss, Resource); diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index 6d5959db7..cbe61fbb6 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -50,10 +50,10 @@ #include "core/version.h" #include "drivers/png/png_driver_common.h" #include "scene/2d/node_2d.h" -#include "scene/3d/camera_3d.h" -#include "scene/3d/mesh_instance_3d.h" -#include "scene/3d/multimesh_instance_3d.h" -#include "scene/3d/node_3d.h" +#include "scene/3d/camera.h" +#include "scene/3d/mesh_instance.h" +#include "scene/3d/multimesh_instance.h" +#include "scene/3d/spatial.h" #include "scene/animation/animation_player.h" #include "scene/resources/importer_mesh.h" #include "scene/resources/material.h" @@ -63,13 +63,6 @@ #include "modules/modules_enabled.gen.h" // For csg, gridmap. -#ifdef MODULE_CSG_ENABLED -#include "modules/csg/csg_shape.h" -#endif // MODULE_CSG_ENABLED -#ifdef MODULE_GRIDMAP_ENABLED -#include "modules/gridmap/grid_map.h" -#endif // MODULE_GRIDMAP_ENABLED - // FIXME: Hardcoded to avoid editor dependency. #define GLTF_IMPORT_USE_NAMED_SKIN_BINDS 16 #define GLTF_IMPORT_DISCARD_MESHES_AND_MATERIALS 32 diff --git a/modules/gltf/gltf_document.h b/modules/gltf/gltf_document.h index eb55808d9..9b02b9f94 100644 --- a/modules/gltf/gltf_document.h +++ b/modules/gltf/gltf_document.h @@ -34,14 +34,12 @@ #include "gltf_defines.h" #include "structures/gltf_animation.h" -#include "scene/3d/bone_attachment_3d.h" -#include "scene/3d/importer_mesh_instance_3d.h" -#include "scene/3d/mesh_instance_3d.h" +#include "scene/3d/bone_attachment.h" +#include "scene/3d/importer_mesh_instance.h" +#include "scene/3d/mesh_instance.h" #include "scene/animation/animation_player.h" #include "scene/resources/material.h" -#include "modules/modules_enabled.gen.h" // For csg, gridmap. - class GLTFDocument : public Resource { GDCLASS(GLTFDocument, Resource); TypedArray document_extensions; diff --git a/modules/gltf/gltf_document_extension_convert_importer_mesh.cpp b/modules/gltf/gltf_document_extension_convert_importer_mesh.cpp index 1620900a0..046e18d92 100644 --- a/modules/gltf/gltf_document_extension_convert_importer_mesh.cpp +++ b/modules/gltf/gltf_document_extension_convert_importer_mesh.cpp @@ -33,7 +33,7 @@ #include "gltf_state.h" #include "core/error/error_macros.h" -#include "scene/3d/mesh_instance_3d.h" +#include "scene/3d/mesh_instance.h" #include "scene/resources/importer_mesh.h" void GLTFDocumentExtensionConvertImporterMesh::_bind_methods() { diff --git a/modules/gltf/gltf_document_extension_convert_importer_mesh.h b/modules/gltf/gltf_document_extension_convert_importer_mesh.h index cdb089bba..e8e29fb60 100644 --- a/modules/gltf/gltf_document_extension_convert_importer_mesh.h +++ b/modules/gltf/gltf_document_extension_convert_importer_mesh.h @@ -34,7 +34,7 @@ #include "gltf_document_extension.h" #include "scene/3d/importer_mesh_instance_3d.h" -#include "scene/3d/mesh_instance_3d.h" +#include "scene/3d/mesh_instance.h" #include "scene/resources/importer_mesh.h" class GLTFDocumentExtensionConvertImporterMesh : public GLTFDocumentExtension { diff --git a/modules/gltf/gltf_state.h b/modules/gltf/gltf_state.h index a206b6114..f42b62759 100644 --- a/modules/gltf/gltf_state.h +++ b/modules/gltf/gltf_state.h @@ -43,7 +43,7 @@ #include "structures/gltf_skin.h" #include "structures/gltf_texture.h" -#include "core/templates/rb_map.h" +#include "core/rb_map.h" #include "scene/animation/animation_player.h" #include "scene/resources/texture.h" diff --git a/modules/gltf/gltf_template_convert.h b/modules/gltf/gltf_template_convert.h index d4466247e..f0d8dfd50 100644 --- a/modules/gltf/gltf_template_convert.h +++ b/modules/gltf/gltf_template_convert.h @@ -31,9 +31,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/templates/hash_set.h" -#include "core/variant/array.h" -#include "core/variant/dictionary.h" +#include "core/hash_set.h" +#include "core/array.h" +#include "core/dictionary.h" namespace GLTFTemplateConvert { template diff --git a/modules/gltf/register_types.cpp b/modules/gltf/register_types.cpp index a948d4460..19b81d34d 100644 --- a/modules/gltf/register_types.cpp +++ b/modules/gltf/register_types.cpp @@ -57,7 +57,7 @@ void unregister_gltf_types() { #include "structures/gltf_texture.h" #ifdef TOOLS_ENABLED -#include "core/config/project_settings.h" +#include "core/project_settings.h" #include "editor/editor_node.h" #include "editor/editor_scene_exporter_gltf_plugin.h" #include "editor/editor_scene_importer_blend.h" diff --git a/modules/gltf/structures/gltf_accessor.cpp b/modules/gltf/structures/gltf_accessor.cpp index 1b8911fe7..dfeabb804 100644 --- a/modules/gltf/structures/gltf_accessor.cpp +++ b/modules/gltf/structures/gltf_accessor.cpp @@ -66,8 +66,8 @@ void GLTFAccessor::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "normalized"), "set_normalized", "get_normalized"); // bool ADD_PROPERTY(PropertyInfo(Variant::INT, "count"), "set_count", "get_count"); // int ADD_PROPERTY(PropertyInfo(Variant::INT, "type"), "set_type", "get_type"); // GLTFType - ADD_PROPERTY(PropertyInfo(Variant::PACKED_FLOAT64_ARRAY, "min"), "set_min", "get_min"); // Vector - ADD_PROPERTY(PropertyInfo(Variant::PACKED_FLOAT64_ARRAY, "max"), "set_max", "get_max"); // Vector + ADD_PROPERTY(PropertyInfo(Variant::POOL_REAL_ARRAY, "min"), "set_min", "get_min"); // Vector + ADD_PROPERTY(PropertyInfo(Variant::POOL_REAL_ARRAY, "max"), "set_max", "get_max"); // Vector ADD_PROPERTY(PropertyInfo(Variant::INT, "sparse_count"), "set_sparse_count", "get_sparse_count"); // int ADD_PROPERTY(PropertyInfo(Variant::INT, "sparse_indices_buffer_view"), "set_sparse_indices_buffer_view", "get_sparse_indices_buffer_view"); // int ADD_PROPERTY(PropertyInfo(Variant::INT, "sparse_indices_byte_offset"), "set_sparse_indices_byte_offset", "get_sparse_indices_byte_offset"); // int diff --git a/modules/gltf/structures/gltf_accessor.h b/modules/gltf/structures/gltf_accessor.h index b2c105e37..8a7d7fd72 100644 --- a/modules/gltf/structures/gltf_accessor.h +++ b/modules/gltf/structures/gltf_accessor.h @@ -31,7 +31,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/io/resource.h" +#include "core/resource.h" #include "../gltf_defines.h" diff --git a/modules/gltf/structures/gltf_animation.h b/modules/gltf/structures/gltf_animation.h index f490d402d..0bf3c2324 100644 --- a/modules/gltf/structures/gltf_animation.h +++ b/modules/gltf/structures/gltf_animation.h @@ -31,7 +31,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/io/resource.h" +#include "core/resource.h" class GLTFAnimation : public Resource { GDCLASS(GLTFAnimation, Resource); diff --git a/modules/gltf/structures/gltf_buffer_view.h b/modules/gltf/structures/gltf_buffer_view.h index 20b1aecdf..9a0d5dd4d 100644 --- a/modules/gltf/structures/gltf_buffer_view.h +++ b/modules/gltf/structures/gltf_buffer_view.h @@ -32,7 +32,7 @@ /*************************************************************************/ #include "../gltf_defines.h" -#include "core/io/resource.h" +#include "core/resource.h" class GLTFBufferView : public Resource { GDCLASS(GLTFBufferView, Resource); diff --git a/modules/gltf/structures/gltf_camera.h b/modules/gltf/structures/gltf_camera.h index efbe2ac7a..afbec0ba7 100644 --- a/modules/gltf/structures/gltf_camera.h +++ b/modules/gltf/structures/gltf_camera.h @@ -31,7 +31,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/io/resource.h" +#include "core/resource.h" class GLTFCamera : public Resource { GDCLASS(GLTFCamera, Resource); diff --git a/modules/gltf/structures/gltf_mesh.h b/modules/gltf/structures/gltf_mesh.h index daef66aa9..bcf2ff54e 100644 --- a/modules/gltf/structures/gltf_mesh.h +++ b/modules/gltf/structures/gltf_mesh.h @@ -31,7 +31,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/io/resource.h" +#include "core/resource.h" #include "scene/3d/importer_mesh_instance_3d.h" #include "scene/resources/importer_mesh.h" #include "scene/resources/mesh.h" diff --git a/modules/gltf/structures/gltf_node.h b/modules/gltf/structures/gltf_node.h index 387876a33..f33b084ba 100644 --- a/modules/gltf/structures/gltf_node.h +++ b/modules/gltf/structures/gltf_node.h @@ -32,7 +32,7 @@ /*************************************************************************/ #include "../gltf_defines.h" -#include "core/io/resource.h" +#include "core/resource.h" class GLTFNode : public Resource { GDCLASS(GLTFNode, Resource); diff --git a/modules/gltf/structures/gltf_skeleton.cpp b/modules/gltf/structures/gltf_skeleton.cpp index 1bd342091..a3c9ea40a 100644 --- a/modules/gltf/structures/gltf_skeleton.cpp +++ b/modules/gltf/structures/gltf_skeleton.cpp @@ -31,7 +31,7 @@ #include "gltf_skeleton.h" #include "../gltf_template_convert.h" -#include "scene/3d/bone_attachment_3d.h" +#include "scene/3d/bone_attachment.h" void GLTFSkeleton::_bind_methods() { ClassDB::bind_method(D_METHOD("get_joints"), &GLTFSkeleton::get_joints); diff --git a/modules/gltf/structures/gltf_skeleton.h b/modules/gltf/structures/gltf_skeleton.h index 5249f8b88..ea7783b04 100644 --- a/modules/gltf/structures/gltf_skeleton.h +++ b/modules/gltf/structures/gltf_skeleton.h @@ -32,7 +32,7 @@ /*************************************************************************/ #include "../gltf_defines.h" -#include "core/io/resource.h" +#include "core/resource.h" class GLTFSkeleton : public Resource { GDCLASS(GLTFSkeleton, Resource); diff --git a/modules/gltf/structures/gltf_skin.h b/modules/gltf/structures/gltf_skin.h index 02eb06b4b..8e6a841eb 100644 --- a/modules/gltf/structures/gltf_skin.h +++ b/modules/gltf/structures/gltf_skin.h @@ -32,7 +32,7 @@ /*************************************************************************/ #include "../gltf_defines.h" -#include "core/io/resource.h" +#include "core/resource.h" class GLTFSkin : public Resource { GDCLASS(GLTFSkin, Resource); diff --git a/modules/gltf/structures/gltf_texture.h b/modules/gltf/structures/gltf_texture.h index 7c569ad8b..27c78041b 100644 --- a/modules/gltf/structures/gltf_texture.h +++ b/modules/gltf/structures/gltf_texture.h @@ -32,7 +32,7 @@ /*************************************************************************/ #include "../gltf_defines.h" -#include "core/io/resource.h" +#include "core/resource.h" class GLTFTexture : public Resource { GDCLASS(GLTFTexture, Resource);