From c621049e61d437c83096d5ecacd716e73f3b71a8 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 17 Mar 2022 09:07:18 +0100 Subject: [PATCH] Moved more includes to cpp files. --- editor/spatial_editor_gizmos.cpp | 1 + modules/gltf/editor_scene_importer_gltf.cpp | 1 + modules/gltf/gltf_document.cpp | 1 + modules/gltf/gltf_skin.cpp | 10 ++++++++++ modules/gltf/gltf_skin.h | 5 +++++ modules/gltf/gltf_state.cpp | 2 ++ modules/gltf/packed_scene_gltf.cpp | 1 + modules/skeleton_editor/spatial_editor_gizmos.cpp | 1 + scene/3d/physics_joint.cpp | 1 + scene/3d/physics_joint.h | 3 ++- scene/3d/reflection_probe.cpp | 3 +++ scene/3d/reflection_probe.h | 3 --- scene/3d/skeleton.cpp | 1 + scene/3d/skeleton.h | 3 ++- scene/register_scene_types.cpp | 1 + 15 files changed, 32 insertions(+), 5 deletions(-) diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index 6d2db3c34..40e694967 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -67,6 +67,7 @@ #include "scene/resources/surface_tool.h" #include "scene/resources/navigation_mesh.h" #include "scene/main/viewport.h" +#include "scene/resources/skin.h" #define HANDLE_HALF_SIZE 9.5 diff --git a/modules/gltf/editor_scene_importer_gltf.cpp b/modules/gltf/editor_scene_importer_gltf.cpp index db2074a88..af4bc9261 100644 --- a/modules/gltf/editor_scene_importer_gltf.cpp +++ b/modules/gltf/editor_scene_importer_gltf.cpp @@ -32,6 +32,7 @@ #include "editor_scene_importer_gltf.h" #include "scene/resources/animation.h" +#include "scene/resources/skin.h" #include "gltf_state.h" #include "packed_scene_gltf.h" diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index 11b2f0002..29936ed3e 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -59,6 +59,7 @@ #include "scene/main/node.h" #include "scene/resources/surface_tool.h" #include "scene/resources/multimesh.h" +#include "scene/resources/skin.h" #include "modules/modules_enabled.gen.h" // For csg, gridmap, regex. diff --git a/modules/gltf/gltf_skin.cpp b/modules/gltf/gltf_skin.cpp index 390880061..e35b978b1 100644 --- a/modules/gltf/gltf_skin.cpp +++ b/modules/gltf/gltf_skin.cpp @@ -30,6 +30,8 @@ #include "gltf_skin.h" +#include "scene/resources/skin.h" + void GLTFSkin::_bind_methods() { ClassDB::bind_method(D_METHOD("get_skin_root"), &GLTFSkin::get_skin_root); ClassDB::bind_method(D_METHOD("set_skin_root", "skin_root"), &GLTFSkin::set_skin_root); @@ -153,3 +155,11 @@ Ref GLTFSkin::get_godot_skin() { void GLTFSkin::set_godot_skin(Ref p_godot_skin) { godot_skin = p_godot_skin; } + +GLTFSkin::GLTFSkin() { + +} + +GLTFSkin::~GLTFSkin() { + +} diff --git a/modules/gltf/gltf_skin.h b/modules/gltf/gltf_skin.h index 8b20d8b7f..3cc7cc47e 100644 --- a/modules/gltf/gltf_skin.h +++ b/modules/gltf/gltf_skin.h @@ -35,6 +35,8 @@ #include "gltf_document.h" +class Skin; + class GLTFSkin : public Resource { GDCLASS(GLTFSkin, Resource); friend class GLTFDocument; @@ -106,6 +108,9 @@ public: Ref get_godot_skin(); void set_godot_skin(Ref p_godot_skin); + + GLTFSkin(); + ~GLTFSkin(); }; #endif // GLTF_SKIN_H diff --git a/modules/gltf/gltf_state.cpp b/modules/gltf/gltf_state.cpp index 7c9818b94..82beb2be8 100644 --- a/modules/gltf/gltf_state.cpp +++ b/modules/gltf/gltf_state.cpp @@ -30,6 +30,8 @@ #include "gltf_state.h" +#include "scene/resources/skin.h" + void GLTFState::_bind_methods() { ClassDB::bind_method(D_METHOD("get_json"), &GLTFState::get_json); ClassDB::bind_method(D_METHOD("set_json", "json"), &GLTFState::set_json); diff --git a/modules/gltf/packed_scene_gltf.cpp b/modules/gltf/packed_scene_gltf.cpp index 409d93883..fc1daea50 100644 --- a/modules/gltf/packed_scene_gltf.cpp +++ b/modules/gltf/packed_scene_gltf.cpp @@ -36,6 +36,7 @@ #include "scene/3d/spatial.h" #include "scene/animation/animation_player.h" #include "scene/resources/mesh.h" +#include "scene/resources/skin.h" #include "gltf_document.h" diff --git a/modules/skeleton_editor/spatial_editor_gizmos.cpp b/modules/skeleton_editor/spatial_editor_gizmos.cpp index f2ac0b506..558fb2767 100644 --- a/modules/skeleton_editor/spatial_editor_gizmos.cpp +++ b/modules/skeleton_editor/spatial_editor_gizmos.cpp @@ -31,6 +31,7 @@ #include "spatial_editor_gizmos.h" #include "scene/resources/surface_tool.h" +#include "scene/resources/skin.h" ModuleSkeletonSpatialGizmoPlugin::ModuleSkeletonSpatialGizmoPlugin() { diff --git a/scene/3d/physics_joint.cpp b/scene/3d/physics_joint.cpp index c05d645a4..9924ca1a6 100644 --- a/scene/3d/physics_joint.cpp +++ b/scene/3d/physics_joint.cpp @@ -31,6 +31,7 @@ #include "physics_joint.h" #include "scene/scene_string_names.h" +#include "scene/3d/physics_body.h" void Joint::_disconnect_signals() { Node *node_a = get_node_or_null(a); diff --git a/scene/3d/physics_joint.h b/scene/3d/physics_joint.h index 1f6560b78..ec8c2d621 100644 --- a/scene/3d/physics_joint.h +++ b/scene/3d/physics_joint.h @@ -31,9 +31,10 @@ #ifndef PHYSICS_JOINT_H #define PHYSICS_JOINT_H -#include "scene/3d/physics_body.h" #include "scene/3d/spatial.h" +class PhysicsBody; + class Joint : public Spatial { GDCLASS(Joint, Spatial); diff --git a/scene/3d/reflection_probe.cpp b/scene/3d/reflection_probe.cpp index 44759b225..53fd440be 100644 --- a/scene/3d/reflection_probe.cpp +++ b/scene/3d/reflection_probe.cpp @@ -29,6 +29,9 @@ /*************************************************************************/ #include "reflection_probe.h" +#include "scene/resources/sky.h" +#include "scene/resources/texture.h" +#include "servers/visual_server.h" void ReflectionProbe::set_intensity(float p_intensity) { intensity = p_intensity; diff --git a/scene/3d/reflection_probe.h b/scene/3d/reflection_probe.h index 58e700c9d..17d1bc2c7 100644 --- a/scene/3d/reflection_probe.h +++ b/scene/3d/reflection_probe.h @@ -32,9 +32,6 @@ #define REFLECTIONPROBE_H #include "scene/3d/visual_instance.h" -#include "scene/resources/sky.h" -#include "scene/resources/texture.h" -#include "servers/visual_server.h" class ReflectionProbe : public VisualInstance { GDCLASS(ReflectionProbe, VisualInstance); diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp index 88bf90cea..89ff8187f 100644 --- a/scene/3d/skeleton.cpp +++ b/scene/3d/skeleton.cpp @@ -35,6 +35,7 @@ #include "core/project_settings.h" #include "scene/3d/physics_body.h" #include "scene/resources/surface_tool.h" +#include "scene/resources/skin.h" void SkinReference::_skin_changed() { if (skeleton_node) { diff --git a/scene/3d/skeleton.h b/scene/3d/skeleton.h index 64dca3d37..12da3d523 100644 --- a/scene/3d/skeleton.h +++ b/scene/3d/skeleton.h @@ -33,7 +33,7 @@ #include "core/rid.h" #include "scene/3d/spatial.h" -#include "scene/resources/skin.h" +#include "core/reference.h" #ifndef _3D_DISABLED typedef int BoneId; @@ -42,6 +42,7 @@ class PhysicalBone; #endif // _3D_DISABLED class Skeleton; +class Skin; class SkinReference : public Reference { GDCLASS(SkinReference, Reference) diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 876f22134..ccb1146e1 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -170,6 +170,7 @@ #include "scene/resources/video_stream.h" #include "scene/resources/world.h" #include "scene/resources/world_2d.h" +#include "scene/resources/skin.h" #include "scene/scene_string_names.h" #ifndef _3D_DISABLED