diff --git a/core/variant/typed_array.h b/core/variant/typed_array.h index 50411121bc96..c66746198387 100644 --- a/core/variant/typed_array.h +++ b/core/variant/typed_array.h @@ -33,6 +33,7 @@ #include "core/variant/array.h" #include "core/variant/method_ptrcall.h" +#include "core/variant/type_info.h" #include "core/variant/variant.h" template diff --git a/scene/2d/animated_sprite_2d.cpp b/scene/2d/animated_sprite_2d.cpp index decb3d0dd829..12f3e065e618 100644 --- a/scene/2d/animated_sprite_2d.cpp +++ b/scene/2d/animated_sprite_2d.cpp @@ -30,7 +30,21 @@ #include "animated_sprite_2d.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/transform_2d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" #include "scene/main/viewport.h" +#include "scene/resources/texture.h" #include "scene/scene_string_names.h" #ifdef TOOLS_ENABLED diff --git a/scene/2d/animated_sprite_2d.h b/scene/2d/animated_sprite_2d.h index b3af931ea2af..757355a24b86 100644 --- a/scene/2d/animated_sprite_2d.h +++ b/scene/2d/animated_sprite_2d.h @@ -31,9 +31,18 @@ #ifndef ANIMATED_SPRITE_2D_H #define ANIMATED_SPRITE_2D_H +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/variant/dictionary.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" #include "scene/resources/sprite_frames.h" +class String; + class AnimatedSprite2D : public Node2D { GDCLASS(AnimatedSprite2D, Node2D); diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index 70b9b769cdc6..42aa6e2377e2 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -30,8 +30,20 @@ #include "area_2d.h" +#include "core/error/error_macros.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/pair.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/callable.h" +#include "core/variant/variant.h" +#include "scene/2d/node_2d.h" +#include "scene/main/node.h" #include "scene/scene_string_names.h" #include "servers/audio_server.h" +#include "servers/physics_server_2d.h" void Area2D::set_gravity_space_override_mode(SpaceOverride p_mode) { gravity_space_override = p_mode; diff --git a/scene/2d/area_2d.h b/scene/2d/area_2d.h index 68047ccebf5b..8deade1d4f58 100644 --- a/scene/2d/area_2d.h +++ b/scene/2d/area_2d.h @@ -31,9 +31,21 @@ #ifndef AREA_2D_H #define AREA_2D_H +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/string_name.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" #include "core/templates/vset.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/2d/collision_object_2d.h" +class Node2D; +class Node; + class Area2D : public CollisionObject2D { GDCLASS(Area2D, CollisionObject2D); diff --git a/scene/2d/audio_listener_2d.cpp b/scene/2d/audio_listener_2d.cpp index 8fae339756b8..07090d801fc8 100644 --- a/scene/2d/audio_listener_2d.cpp +++ b/scene/2d/audio_listener_2d.cpp @@ -30,6 +30,11 @@ #include "audio_listener_2d.h" +#include "core/object/class_db.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/main/viewport.h" + bool AudioListener2D::_set(const StringName &p_name, const Variant &p_value) { if (p_name == "current") { if (p_value.operator bool()) { diff --git a/scene/2d/audio_listener_2d.h b/scene/2d/audio_listener_2d.h index 172d388efc5d..6c35dbd50e45 100644 --- a/scene/2d/audio_listener_2d.h +++ b/scene/2d/audio_listener_2d.h @@ -31,6 +31,10 @@ #ifndef LISTENER_2D_H #define LISTENER_2D_H +#include "core/object/object.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/variant/variant.h" #include "scene/2d/node_2d.h" #include "scene/main/window.h" diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index a761d0d1ec05..62560e26d438 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -30,9 +30,26 @@ #include "audio_stream_player_2d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/set.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "scene/2d/area_2d.h" #include "scene/2d/audio_listener_2d.h" -#include "scene/main/window.h" +#include "scene/main/node.h" +#include "scene/main/viewport.h" +#include "scene/resources/world_2d.h" +#include "servers/audio/audio_stream.h" +#include "servers/audio_server.h" +#include "servers/physics_server_2d.h" void AudioStreamPlayer2D::_notification(int p_what) { if (p_what == NOTIFICATION_ENTER_TREE) { diff --git a/scene/2d/audio_stream_player_2d.h b/scene/2d/audio_stream_player_2d.h index 73b09e432f4e..894b9d9d9a64 100644 --- a/scene/2d/audio_stream_player_2d.h +++ b/scene/2d/audio_stream_player_2d.h @@ -31,10 +31,22 @@ #ifndef AUDIO_STREAM_PLAYER_2D_H #define AUDIO_STREAM_PLAYER_2D_H +#include + +#include "core/math/audio_frame.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/safe_refcount.h" +#include "core/templates/vector.h" #include "scene/2d/node_2d.h" #include "servers/audio/audio_stream.h" #include "servers/audio_server.h" +class AudioStream; +class AudioStreamPlayback; +class Viewport; + class AudioStreamPlayer2D : public Node2D { GDCLASS(AudioStreamPlayer2D, Node2D); diff --git a/scene/2d/back_buffer_copy.cpp b/scene/2d/back_buffer_copy.cpp index c411aaf41164..4a97b2e00ab8 100644 --- a/scene/2d/back_buffer_copy.cpp +++ b/scene/2d/back_buffer_copy.cpp @@ -30,6 +30,10 @@ #include "back_buffer_copy.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "servers/rendering_server.h" + void BackBufferCopy::_update_copy_mode() { switch (copy_mode) { case COPY_MODE_DISABLED: { diff --git a/scene/2d/back_buffer_copy.h b/scene/2d/back_buffer_copy.h index 4e7cac1f3ef2..cac1391f652c 100644 --- a/scene/2d/back_buffer_copy.h +++ b/scene/2d/back_buffer_copy.h @@ -31,6 +31,9 @@ #ifndef BACKBUFFERCOPY_H #define BACKBUFFERCOPY_H +#include "core/math/rect2.h" +#include "core/object/object.h" +#include "core/variant/binder_common.h" #include "scene/2d/node_2d.h" class BackBufferCopy : public Node2D { diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index e8dfaf9c2eec..63bf4bd48768 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -30,6 +30,20 @@ #include "camera_2d.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/main/viewport.h" #include "scene/main/window.h" void Camera2D::_update_scroll() { diff --git a/scene/2d/camera_2d.h b/scene/2d/camera_2d.h index 662bee3612e2..96b1c44f1889 100644 --- a/scene/2d/camera_2d.h +++ b/scene/2d/camera_2d.h @@ -31,8 +31,19 @@ #ifndef CAMERA_2D_H #define CAMERA_2D_H +#include "core/math/math_defs.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/string_name.h" +#include "core/templates/rid.h" +#include "core/variant/binder_common.h" #include "scene/2d/node_2d.h" +class Node; +class Viewport; + class Camera2D : public Node2D { GDCLASS(Camera2D, Node2D); diff --git a/scene/2d/canvas_group.cpp b/scene/2d/canvas_group.cpp index 37a858330cd8..694ad79ca190 100644 --- a/scene/2d/canvas_group.cpp +++ b/scene/2d/canvas_group.cpp @@ -30,6 +30,11 @@ #include "canvas_group.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "servers/rendering_server.h" + void CanvasGroup::set_fit_margin(real_t p_fit_margin) { ERR_FAIL_COND(p_fit_margin < 0.0); diff --git a/scene/2d/canvas_group.h b/scene/2d/canvas_group.h index 9bc1772ee205..07c77f03d269 100644 --- a/scene/2d/canvas_group.h +++ b/scene/2d/canvas_group.h @@ -31,6 +31,8 @@ #ifndef CANVASGROUP_H #define CANVASGROUP_H +#include "core/math/math_defs.h" +#include "core/object/object.h" #include "scene/2d/node_2d.h" class CanvasGroup : public Node2D { diff --git a/scene/2d/canvas_modulate.cpp b/scene/2d/canvas_modulate.cpp index d0abed4a0c31..902a81694f7e 100644 --- a/scene/2d/canvas_modulate.cpp +++ b/scene/2d/canvas_modulate.cpp @@ -30,6 +30,16 @@ #include "canvas_modulate.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "servers/rendering_server.h" + void CanvasModulate::_notification(int p_what) { if (p_what == NOTIFICATION_ENTER_CANVAS) { if (is_visible_in_tree()) { diff --git a/scene/2d/canvas_modulate.h b/scene/2d/canvas_modulate.h index ec37449f8f08..8b4c098776cf 100644 --- a/scene/2d/canvas_modulate.h +++ b/scene/2d/canvas_modulate.h @@ -31,8 +31,13 @@ #ifndef CANVASMODULATE_H #define CANVASMODULATE_H +#include "core/math/color.h" +#include "core/object/object.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" +class String; + class CanvasModulate : public Node2D { GDCLASS(CanvasModulate, Node2D); diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp index 70c7e48fd46a..94c13fdff062 100644 --- a/scene/2d/collision_object_2d.cpp +++ b/scene/2d/collision_object_2d.cpp @@ -30,6 +30,17 @@ #include "collision_object_2d.h" +#include "core/error/error_macros.h" +#include "core/input/input_event.h" +#include "core/object/class_db.h" +#include "core/object/script_language.h" +#include "core/string/ustring.h" +#include "core/templates/pair.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/viewport.h" +#include "scene/resources/world_2d.h" #include "scene/scene_string_names.h" void CollisionObject2D::_notification(int p_what) { diff --git a/scene/2d/collision_object_2d.h b/scene/2d/collision_object_2d.h index f2b7eecc7bdd..117b24c5550b 100644 --- a/scene/2d/collision_object_2d.h +++ b/scene/2d/collision_object_2d.h @@ -31,11 +31,32 @@ #ifndef COLLISION_OBJECT_2D_H #define COLLISION_OBJECT_2D_H +#include + +#include "core/math/math_defs.h" +#include "core/math/transform_2d.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" #include "scene/main/viewport.h" #include "scene/resources/shape_2d.h" #include "servers/physics_server_2d.h" +class InputEvent; +class String; +class Viewport; + class CollisionObject2D : public Node2D { GDCLASS(CollisionObject2D, Node2D); diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index 2923b287be88..ef8a5029c372 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -30,12 +30,25 @@ #include "collision_polygon_2d.h" +#include + #include "collision_object_2d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" #include "core/math/geometry_2d.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" #include "scene/resources/concave_polygon_shape_2d.h" #include "scene/resources/convex_polygon_shape_2d.h" - -#include "thirdparty/misc/polypartition.h" +#include "scene/resources/shape_2d.h" void CollisionPolygon2D::_build_polygon() { parent->shape_owner_clear_shapes(owner_id); diff --git a/scene/2d/collision_polygon_2d.h b/scene/2d/collision_polygon_2d.h index e18022ab7e66..9c7fae377b03 100644 --- a/scene/2d/collision_polygon_2d.h +++ b/scene/2d/collision_polygon_2d.h @@ -31,9 +31,19 @@ #ifndef COLLISION_POLYGON_2D_H #define COLLISION_POLYGON_2D_H +#include + +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" class CollisionObject2D; +class String; class CollisionPolygon2D : public Node2D { GDCLASS(CollisionPolygon2D, Node2D); diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index a0520ca28f8e..e771d88142bb 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -30,7 +30,20 @@ #include "collision_shape_2d.h" +#include + #include "collision_object_2d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" #include "scene/resources/concave_polygon_shape_2d.h" #include "scene/resources/convex_polygon_shape_2d.h" diff --git a/scene/2d/collision_shape_2d.h b/scene/2d/collision_shape_2d.h index dbc81e842480..1d6233192dba 100644 --- a/scene/2d/collision_shape_2d.h +++ b/scene/2d/collision_shape_2d.h @@ -31,10 +31,19 @@ #ifndef COLLISION_SHAPE_2D_H #define COLLISION_SHAPE_2D_H +#include + +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" #include "scene/resources/shape_2d.h" class CollisionObject2D; +class String; class CollisionShape2D : public Node2D { GDCLASS(CollisionShape2D, Node2D); diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp index 4673a9908251..2cb70aa9c387 100644 --- a/scene/2d/cpu_particles_2d.cpp +++ b/scene/2d/cpu_particles_2d.cpp @@ -30,9 +30,31 @@ #include "cpu_particles_2d.h" +#include +#include + #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/math/vector3.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/sort_array.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" #include "scene/2d/gpu_particles_2d.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/canvas_item_material.h" +#include "scene/resources/curve.h" +#include "scene/resources/gradient.h" +#include "scene/resources/material.h" #include "scene/resources/particles_material.h" +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" void CPUParticles2D::set_emitting(bool p_emitting) { if (emitting == p_emitting) { diff --git a/scene/2d/cpu_particles_2d.h b/scene/2d/cpu_particles_2d.h index 8c8f161d74d4..34814ec359dd 100644 --- a/scene/2d/cpu_particles_2d.h +++ b/scene/2d/cpu_particles_2d.h @@ -31,8 +31,27 @@ #ifndef CPU_PARTICLES_2D_H #define CPU_PARTICLES_2D_H +#include + +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/mutex.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" +class Curve; +class Gradient; +class Node; +class String; +class Texture2D; + class CPUParticles2D : public Node2D { private: GDCLASS(CPUParticles2D, Node2D); diff --git a/scene/2d/gpu_particles_2d.cpp b/scene/2d/gpu_particles_2d.cpp index 11c036ac9c39..ab86650fd4c7 100644 --- a/scene/2d/gpu_particles_2d.cpp +++ b/scene/2d/gpu_particles_2d.cpp @@ -30,11 +30,28 @@ #include "gpu_particles_2d.h" +#include + +#include "core/error/error_macros.h" +#include "core/math/aabb.h" +#include "core/math/basis.h" +#include "core/math/transform_2d.h" +#include "core/math/transform_3d.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/canvas_item_material.h" +#include "scene/resources/material.h" #include "scene/resources/particles_material.h" - -#ifdef TOOLS_ENABLED -#include "core/config/engine.h" -#endif +#include "scene/resources/texture.h" void GPUParticles2D::set_emitting(bool p_emitting) { RS::get_singleton()->particles_set_emitting(particles, p_emitting); diff --git a/scene/2d/gpu_particles_2d.h b/scene/2d/gpu_particles_2d.h index fc95ae27b2be..ac7480c9ba5d 100644 --- a/scene/2d/gpu_particles_2d.h +++ b/scene/2d/gpu_particles_2d.h @@ -31,7 +31,25 @@ #ifndef PARTICLES_2D_H #define PARTICLES_2D_H +#include + +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/templates/rid.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" +#include "servers/rendering_server.h" + +class Material; +class String; +class Texture2D; +struct Transform2D; +struct Vector2; class GPUParticles2D : public Node2D { private: diff --git a/scene/2d/joint_2d.cpp b/scene/2d/joint_2d.cpp index 62a77fb96991..c77e7c3a2196 100644 --- a/scene/2d/joint_2d.cpp +++ b/scene/2d/joint_2d.cpp @@ -30,8 +30,21 @@ #include "joint_2d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" #include "physics_body_2d.h" +#include "scene/2d/node_2d.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" #include "scene/scene_string_names.h" +#include "servers/physics_server_2d.h" void Joint2D::_disconnect_signals() { Node *node_a = get_node_or_null(a); diff --git a/scene/2d/joint_2d.h b/scene/2d/joint_2d.h index e3cd600cbd47..560e61499bab 100644 --- a/scene/2d/joint_2d.h +++ b/scene/2d/joint_2d.h @@ -31,6 +31,13 @@ #ifndef JOINT_2D_H #define JOINT_2D_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/string/node_path.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/typed_array.h" #include "node_2d.h" class PhysicsBody2D; diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index f496e1aac2af..7d854066f0bf 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -30,6 +30,17 @@ #include "light_2d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/transform_2d.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "servers/rendering_server.h" + void Light2D::_update_light_visibility() { if (!is_inside_tree()) { return; diff --git a/scene/2d/light_2d.h b/scene/2d/light_2d.h index f7b1f420e346..92b144cc29de 100644 --- a/scene/2d/light_2d.h +++ b/scene/2d/light_2d.h @@ -31,7 +31,21 @@ #ifndef LIGHT_2D_H #define LIGHT_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" +#include "scene/resources/texture.h" + +class String; class Light2D : public Node2D { GDCLASS(Light2D, Node2D); diff --git a/scene/2d/light_occluder_2d.cpp b/scene/2d/light_occluder_2d.cpp index 0a7e4c8841f1..64822d7fe711 100644 --- a/scene/2d/light_occluder_2d.cpp +++ b/scene/2d/light_occluder_2d.cpp @@ -29,9 +29,18 @@ /*************************************************************************/ #include "light_occluder_2d.h" -#include "core/math/geometry_2d.h" #include "core/config/engine.h" +#include "core/math/color.h" +#include "core/math/geometry_2d.h" +#include "core/math/math_defs.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "servers/rendering_server.h" #define LINE_GRAB_WIDTH 8 diff --git a/scene/2d/light_occluder_2d.h b/scene/2d/light_occluder_2d.h index 4f8c6d20df69..9f7824cb51ae 100644 --- a/scene/2d/light_occluder_2d.h +++ b/scene/2d/light_occluder_2d.h @@ -31,8 +31,19 @@ #ifndef LIGHTOCCLUDER2D_H #define LIGHTOCCLUDER2D_H +#include "core/io/resource.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" +class String; + class OccluderPolygon2D : public Resource { GDCLASS(OccluderPolygon2D, Resource); diff --git a/scene/2d/line_2d.cpp b/scene/2d/line_2d.cpp index 7f2290bdc731..51d07e70f682 100644 --- a/scene/2d/line_2d.cpp +++ b/scene/2d/line_2d.cpp @@ -31,8 +31,17 @@ #include "line_2d.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" #include "core/math/geometry_2d.h" +#include "core/math/math_defs.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/templates/rid.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "line_builder.h" +#include "scene/main/canvas_item.h" +#include "servers/rendering_server.h" // Needed so we can bind functions VARIANT_ENUM_CAST(Line2D::LineJointMode) diff --git a/scene/2d/line_2d.h b/scene/2d/line_2d.h index 5322c5a5feb5..d53e65828086 100644 --- a/scene/2d/line_2d.h +++ b/scene/2d/line_2d.h @@ -31,7 +31,16 @@ #ifndef LINE2D_H #define LINE2D_H +#include "core/math/color.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/vector.h" #include "node_2d.h" +#include "scene/resources/curve.h" +#include "scene/resources/gradient.h" +#include "scene/resources/texture.h" class Line2D : public Node2D { GDCLASS(Line2D, Node2D); diff --git a/scene/2d/line_builder.cpp b/scene/2d/line_builder.cpp index 25eb9b9851cb..1553b2477a9a 100644 --- a/scene/2d/line_builder.cpp +++ b/scene/2d/line_builder.cpp @@ -30,6 +30,14 @@ #include "line_builder.h" +#include "core/error/error_macros.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "scene/2d/line_2d.h" +#include "scene/resources/curve.h" +#include "scene/resources/gradient.h" + //---------------------------------------------------------------------------- // Util //---------------------------------------------------------------------------- diff --git a/scene/2d/line_builder.h b/scene/2d/line_builder.h index e50acc9ce4e0..9fb77421a5db 100644 --- a/scene/2d/line_builder.h +++ b/scene/2d/line_builder.h @@ -31,8 +31,15 @@ #ifndef LINE_BUILDER_H #define LINE_BUILDER_H +#include "core/math/color.h" +#include "core/math/vector2.h" +#include "core/templates/vector.h" #include "line_2d.h" +class Curve; +class Gradient; +struct Rect2; + class LineBuilder { public: // TODO Move in a struct and reference it diff --git a/scene/2d/mesh_instance_2d.cpp b/scene/2d/mesh_instance_2d.cpp index 5f8a46ad2e70..fd08402a0b53 100644 --- a/scene/2d/mesh_instance_2d.cpp +++ b/scene/2d/mesh_instance_2d.cpp @@ -29,6 +29,12 @@ /*************************************************************************/ #include "mesh_instance_2d.h" + +#include "core/math/aabb.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" #include "scene/scene_string_names.h" void MeshInstance2D::_notification(int p_what) { diff --git a/scene/2d/mesh_instance_2d.h b/scene/2d/mesh_instance_2d.h index 0647d1ddd997..7068da0d34ca 100644 --- a/scene/2d/mesh_instance_2d.h +++ b/scene/2d/mesh_instance_2d.h @@ -31,7 +31,12 @@ #ifndef MESH_INSTANCE_2D_H #define MESH_INSTANCE_2D_H +#include "core/math/rect2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "scene/2d/node_2d.h" +#include "scene/resources/mesh.h" +#include "scene/resources/texture.h" class MeshInstance2D : public Node2D { GDCLASS(MeshInstance2D, Node2D); diff --git a/scene/2d/multimesh_instance_2d.cpp b/scene/2d/multimesh_instance_2d.cpp index e1af99d9316d..8e325f7da1ca 100644 --- a/scene/2d/multimesh_instance_2d.cpp +++ b/scene/2d/multimesh_instance_2d.cpp @@ -29,6 +29,14 @@ /*************************************************************************/ #include "multimesh_instance_2d.h" + +#include "core/math/aabb.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/resources/multimesh.h" +#include "scene/resources/texture.h" #include "scene/scene_string_names.h" void MultiMeshInstance2D::_notification(int p_what) { diff --git a/scene/2d/multimesh_instance_2d.h b/scene/2d/multimesh_instance_2d.h index 37d0d24f8ff4..3ca3d7c3d3b7 100644 --- a/scene/2d/multimesh_instance_2d.h +++ b/scene/2d/multimesh_instance_2d.h @@ -31,9 +31,15 @@ #ifndef MULTIMESH_INSTANCE_2D_H #define MULTIMESH_INSTANCE_2D_H +#include "core/math/rect2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "scene/2d/node_2d.h" #include "scene/resources/multimesh.h" +class MultiMesh; +class Texture2D; + class MultiMeshInstance2D : public Node2D { GDCLASS(MultiMeshInstance2D, Node2D); diff --git a/scene/2d/navigation_agent_2d.cpp b/scene/2d/navigation_agent_2d.cpp index 9331f2dccbf0..f5bc39398b61 100644 --- a/scene/2d/navigation_agent_2d.cpp +++ b/scene/2d/navigation_agent_2d.cpp @@ -30,7 +30,16 @@ #include "navigation_agent_2d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" #include "core/math/geometry_2d.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/2d/node_2d.h" +#include "scene/resources/world_2d.h" #include "servers/navigation_server_2d.h" void NavigationAgent2D::_bind_methods() { diff --git a/scene/2d/navigation_agent_2d.h b/scene/2d/navigation_agent_2d.h index dcedc6506a40..f7db5b6032c5 100644 --- a/scene/2d/navigation_agent_2d.h +++ b/scene/2d/navigation_agent_2d.h @@ -31,9 +31,19 @@ #ifndef NAVIGATION_AGENT_2D_H #define NAVIGATION_AGENT_2D_H +#include + +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/typed_array.h" #include "scene/main/node.h" class Node2D; +class String; class NavigationAgent2D : public Node { GDCLASS(NavigationAgent2D, Node); diff --git a/scene/2d/navigation_obstacle_2d.cpp b/scene/2d/navigation_obstacle_2d.cpp index fad54070a502..50c396443c28 100644 --- a/scene/2d/navigation_obstacle_2d.cpp +++ b/scene/2d/navigation_obstacle_2d.cpp @@ -30,7 +30,18 @@ #include "navigation_obstacle_2d.h" +#include "core/error/error_macros.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "scene/2d/collision_shape_2d.h" +#include "scene/2d/node_2d.h" +#include "scene/resources/shape_2d.h" +#include "scene/resources/world_2d.h" #include "servers/navigation_server_2d.h" void NavigationObstacle2D::_bind_methods() { diff --git a/scene/2d/navigation_obstacle_2d.h b/scene/2d/navigation_obstacle_2d.h index 2a0ef14e7325..093bda2786a9 100644 --- a/scene/2d/navigation_obstacle_2d.h +++ b/scene/2d/navigation_obstacle_2d.h @@ -31,9 +31,16 @@ #ifndef NAVIGATION_OBSTACLE_2D_H #define NAVIGATION_OBSTACLE_2D_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/templates/rid.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" #include "scene/main/node.h" +class Node2D; +class String; + class NavigationObstacle2D : public Node { GDCLASS(NavigationObstacle2D, Node); diff --git a/scene/2d/navigation_region_2d.cpp b/scene/2d/navigation_region_2d.cpp index 4bead978f1ff..81be66c5052d 100644 --- a/scene/2d/navigation_region_2d.cpp +++ b/scene/2d/navigation_region_2d.cpp @@ -30,11 +30,29 @@ #include "navigation_region_2d.h" +#include "core/config/engine.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" #include "core/math/geometry_2d.h" +#include "core/math/math_defs.h" +#include "core/math/random_pcg.h" +#include "core/math/transform_2d.h" +#include "core/math/vector3.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/os/mutex.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/resources/world_2d.h" #include "servers/navigation_server_2d.h" - +#include "servers/rendering_server.h" #include "thirdparty/misc/polypartition.h" #ifdef TOOLS_ENABLED diff --git a/scene/2d/navigation_region_2d.h b/scene/2d/navigation_region_2d.h index 012debb58483..788d4b576b87 100644 --- a/scene/2d/navigation_region_2d.h +++ b/scene/2d/navigation_region_2d.h @@ -31,9 +31,23 @@ #ifndef NAVIGATION_REGION_2D_H #define NAVIGATION_REGION_2D_H +#include + +#include "core/io/resource.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/mutex.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" #include "scene/resources/navigation_mesh.h" +class String; + class NavigationPolygon : public Resource { GDCLASS(NavigationPolygon, Resource); diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index 9d2654324390..9817901616e7 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -30,6 +30,15 @@ #include "node_2d.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/node.h" +#include "servers/rendering_server.h" + #ifdef TOOLS_ENABLED Dictionary Node2D::_edit_get_state() const { Dictionary state; diff --git a/scene/2d/node_2d.h b/scene/2d/node_2d.h index 69d14f82adf7..a8aee6ce4af0 100644 --- a/scene/2d/node_2d.h +++ b/scene/2d/node_2d.h @@ -31,8 +31,16 @@ #ifndef NODE2D_H #define NODE2D_H +#include "core/math/math_defs.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/variant/dictionary.h" #include "scene/main/canvas_item.h" +class Node; +struct Rect2; + class Node2D : public CanvasItem { GDCLASS(Node2D, CanvasItem); diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp index f75baaab0f83..02e1c9d3c49f 100644 --- a/scene/2d/parallax_background.cpp +++ b/scene/2d/parallax_background.cpp @@ -29,7 +29,13 @@ /*************************************************************************/ #include "parallax_background.h" + +#include "core/math/transform_2d.h" +#include "core/object/class_db.h" +#include "core/templates/rid.h" +#include "core/variant/variant.h" #include "parallax_layer.h" +#include "scene/main/node.h" void ParallaxBackground::_notification(int p_what) { switch (p_what) { diff --git a/scene/2d/parallax_background.h b/scene/2d/parallax_background.h index 1a3cb43999ac..7a70dc48fa71 100644 --- a/scene/2d/parallax_background.h +++ b/scene/2d/parallax_background.h @@ -31,8 +31,14 @@ #ifndef PARALLAX_BACKGROUND_H #define PARALLAX_BACKGROUND_H +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/string/ustring.h" #include "scene/main/canvas_layer.h" +struct Transform2D; + class ParallaxBackground : public CanvasLayer { GDCLASS(ParallaxBackground, CanvasLayer); diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp index ff572c9b9ab7..0627577c1f51 100644 --- a/scene/2d/parallax_layer.cpp +++ b/scene/2d/parallax_layer.cpp @@ -30,7 +30,16 @@ #include "parallax_layer.h" +#include + +#include "core/config/engine.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/variant/variant.h" #include "parallax_background.h" +#include "scene/main/node.h" +#include "servers/rendering_server.h" void ParallaxLayer::set_motion_scale(const Size2 &p_scale) { motion_scale = p_scale; diff --git a/scene/2d/parallax_layer.h b/scene/2d/parallax_layer.h index b4dcf0ea6127..51f80ef1c73e 100644 --- a/scene/2d/parallax_layer.h +++ b/scene/2d/parallax_layer.h @@ -31,8 +31,14 @@ #ifndef PARALLAX_LAYER_H #define PARALLAX_LAYER_H +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" +class String; + class ParallaxLayer : public Node2D { GDCLASS(ParallaxLayer, Node2D); diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index 742756113f5d..11a7b51b4c09 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -30,7 +30,18 @@ #include "path_2d.h" +#include "core/config/engine.h" +#include "core/math/color.h" #include "core/math/geometry_2d.h" +#include "core/math/math_funcs.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" #ifdef TOOLS_ENABLED #include "editor/editor_scale.h" diff --git a/scene/2d/path_2d.h b/scene/2d/path_2d.h index bc55f84831fb..c1895e799be0 100644 --- a/scene/2d/path_2d.h +++ b/scene/2d/path_2d.h @@ -31,9 +31,18 @@ #ifndef PATH_2D_H #define PATH_2D_H +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/vector.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" #include "scene/resources/curve.h" +class String; + class Path2D : public Node2D { GDCLASS(Path2D, Node2D); diff --git a/scene/2d/physical_bone_2d.cpp b/scene/2d/physical_bone_2d.cpp index 1fc4b651d800..1c99d3ebf2d2 100644 --- a/scene/2d/physical_bone_2d.cpp +++ b/scene/2d/physical_bone_2d.cpp @@ -30,7 +30,14 @@ #include "physical_bone_2d.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" #include "scene/2d/joint_2d.h" +#include "scene/2d/skeleton_2d.h" +#include "scene/main/node.h" +#include "servers/physics_server_2d.h" void PhysicalBone2D::_notification(int p_what) { switch (p_what) { diff --git a/scene/2d/physical_bone_2d.h b/scene/2d/physical_bone_2d.h index 9f31c22031b1..68dd3af5093c 100644 --- a/scene/2d/physical_bone_2d.h +++ b/scene/2d/physical_bone_2d.h @@ -31,10 +31,15 @@ #ifndef PHYSICAL_BONE_2D_H #define PHYSICAL_BONE_2D_H +#include "core/object/object.h" +#include "core/string/node_path.h" +#include "core/variant/typed_array.h" #include "scene/2d/physics_body_2d.h" #include "scene/2d/skeleton_2d.h" class Joint2D; +class Skeleton2D; +class String; class PhysicalBone2D : public RigidDynamicBody2D { GDCLASS(PhysicalBone2D, RigidDynamicBody2D); diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index fb611addf8b3..254a8711eef7 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -30,7 +30,22 @@ #include "physics_body_2d.h" +#include "core/config/engine.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/pair.h" +#include "core/templates/set.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" +#include "scene/2d/node_2d.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" #include "scene/scene_string_names.h" void PhysicsBody2D::_bind_methods() { diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h index cfaa2570fb6e..e59f6229a9d5 100644 --- a/scene/2d/physics_body_2d.h +++ b/scene/2d/physics_body_2d.h @@ -31,12 +31,31 @@ #ifndef PHYSICS_BODY_2D_H #define PHYSICS_BODY_2D_H +#include + +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" #include "core/templates/vset.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/2d/collision_object_2d.h" #include "scene/resources/physics_material.h" #include "servers/physics_server_2d.h" class KinematicCollision2D; +class Node2D; +class Node; +class String; class PhysicsBody2D : public CollisionObject2D { GDCLASS(PhysicsBody2D, CollisionObject2D); diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp index 1f4dec686499..b291d2a72c0c 100644 --- a/scene/2d/polygon_2d.cpp +++ b/scene/2d/polygon_2d.cpp @@ -30,7 +30,18 @@ #include "polygon_2d.h" +#include "core/error/error_macros.h" #include "core/math/geometry_2d.h" +#include "core/math/transform_2d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" #include "skeleton_2d.h" #ifdef TOOLS_ENABLED diff --git a/scene/2d/polygon_2d.h b/scene/2d/polygon_2d.h index d6a1be0f6de4..6bca39a98fe9 100644 --- a/scene/2d/polygon_2d.h +++ b/scene/2d/polygon_2d.h @@ -31,8 +31,22 @@ #ifndef POLYGON_2D_H #define POLYGON_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/dictionary.h" #include "scene/2d/node_2d.h" +class Texture2D; + class Polygon2D : public Node2D { GDCLASS(Polygon2D, Node2D); diff --git a/scene/2d/position_2d.cpp b/scene/2d/position_2d.cpp index 67aff9c5201f..cfdda4212e84 100644 --- a/scene/2d/position_2d.cpp +++ b/scene/2d/position_2d.cpp @@ -30,6 +30,14 @@ #include "position_2d.h" +#include "core/config/engine.h" +#include "core/math/color.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" + const real_t DEFAULT_GIZMO_EXTENTS = 10.0; void Position2D::_draw_cross() { diff --git a/scene/2d/position_2d.h b/scene/2d/position_2d.h index 4ef07eb05c92..94022c10d746 100644 --- a/scene/2d/position_2d.h +++ b/scene/2d/position_2d.h @@ -31,6 +31,9 @@ #ifndef POSITION_2D_H #define POSITION_2D_H +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/object/object.h" #include "scene/2d/node_2d.h" class Position2D : public Node2D { diff --git a/scene/2d/ray_cast_2d.cpp b/scene/2d/ray_cast_2d.cpp index 9521667854d9..04c4c20e472a 100644 --- a/scene/2d/ray_cast_2d.cpp +++ b/scene/2d/ray_cast_2d.cpp @@ -30,7 +30,24 @@ #include "ray_cast_2d.h" +#include + #include "collision_object_2d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/transform_2d.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/resources/world_2d.h" +#include "servers/physics_server_2d.h" void RayCast2D::set_target_position(const Vector2 &p_point) { target_position = p_point; diff --git a/scene/2d/ray_cast_2d.h b/scene/2d/ray_cast_2d.h index 2c6f2d5c0000..25035747adcb 100644 --- a/scene/2d/ray_cast_2d.h +++ b/scene/2d/ray_cast_2d.h @@ -31,6 +31,13 @@ #ifndef RAY_CAST_2D_H #define RAY_CAST_2D_H +#include + +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/templates/rid.h" +#include "core/templates/set.h" #include "scene/2d/node_2d.h" class CollisionObject2D; diff --git a/scene/2d/remote_transform_2d.cpp b/scene/2d/remote_transform_2d.cpp index e9431efde3fe..61392a29e511 100644 --- a/scene/2d/remote_transform_2d.cpp +++ b/scene/2d/remote_transform_2d.cpp @@ -30,6 +30,14 @@ #include "remote_transform_2d.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" + void RemoteTransform2D::_update_cache() { cache = ObjectID(); if (has_node(remote_node)) { diff --git a/scene/2d/remote_transform_2d.h b/scene/2d/remote_transform_2d.h index bd352e1054fb..55e8f2c87681 100644 --- a/scene/2d/remote_transform_2d.h +++ b/scene/2d/remote_transform_2d.h @@ -31,8 +31,14 @@ #ifndef REMOTE_TRANSFORM_2D_H #define REMOTE_TRANSFORM_2D_H +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" +class String; + class RemoteTransform2D : public Node2D { GDCLASS(RemoteTransform2D, Node2D); diff --git a/scene/2d/shape_cast_2d.cpp b/scene/2d/shape_cast_2d.cpp index 24199c96b5f2..84555f9986e9 100644 --- a/scene/2d/shape_cast_2d.cpp +++ b/scene/2d/shape_cast_2d.cpp @@ -30,12 +30,26 @@ #include "shape_cast_2d.h" +#include + #include "core/config/engine.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/rect2.h" +#include "core/math/transform_2d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/object/object_id.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/2d/collision_object_2d.h" -#include "scene/2d/physics_body_2d.h" -#include "scene/resources/circle_shape_2d.h" -#include "servers/physics_2d/godot_physics_server_2d.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/resources/world_2d.h" void ShapeCast2D::set_target_position(const Vector2 &p_point) { target_position = p_point; diff --git a/scene/2d/shape_cast_2d.h b/scene/2d/shape_cast_2d.h index ea36b25068b5..a337d1e7df88 100644 --- a/scene/2d/shape_cast_2d.h +++ b/scene/2d/shape_cast_2d.h @@ -31,10 +31,23 @@ #ifndef SHAPE_CAST_2D #define SHAPE_CAST_2D +#include + +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/rid.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/typed_array.h" #include "scene/2d/node_2d.h" #include "scene/resources/shape_2d.h" +#include "servers/physics_server_2d.h" class CollisionObject2D; +class String; class ShapeCast2D : public Node2D { GDCLASS(ShapeCast2D, Node2D); diff --git a/scene/2d/skeleton_2d.cpp b/scene/2d/skeleton_2d.cpp index 2270926ea711..02d94c3cc610 100644 --- a/scene/2d/skeleton_2d.cpp +++ b/scene/2d/skeleton_2d.cpp @@ -30,6 +30,22 @@ #include "skeleton_2d.h" +#include + +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/math_funcs.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "editor/editor_data.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_2d.h" +#include "servers/rendering_server.h" + #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" #include "editor/plugins/canvas_item_editor_plugin.h" diff --git a/scene/2d/skeleton_2d.h b/scene/2d/skeleton_2d.h index 98fb867d997e..69d1ccadff85 100644 --- a/scene/2d/skeleton_2d.h +++ b/scene/2d/skeleton_2d.h @@ -31,10 +31,22 @@ #ifndef SKELETON_2D_H #define SKELETON_2D_H +#include "core/math/math_defs.h" +#include "core/math/transform_2d.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/2d/node_2d.h" #include "scene/resources/skeleton_modification_2d.h" class Skeleton2D; +class String; +struct Vector2; class Bone2D : public Node2D { GDCLASS(Bone2D, Node2D); diff --git a/scene/2d/sprite_2d.cpp b/scene/2d/sprite_2d.cpp index 389fa0388fb4..461e8b18874a 100644 --- a/scene/2d/sprite_2d.cpp +++ b/scene/2d/sprite_2d.cpp @@ -31,7 +31,18 @@ #include "sprite_2d.h" #include "core/core_string_names.h" -#include "scene/main/window.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_2d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/viewport.h" +#include "scene/resources/texture.h" #include "scene/scene_string_names.h" #ifdef TOOLS_ENABLED diff --git a/scene/2d/sprite_2d.h b/scene/2d/sprite_2d.h index 6893e92d4a05..3af0360a64c6 100644 --- a/scene/2d/sprite_2d.h +++ b/scene/2d/sprite_2d.h @@ -31,9 +31,19 @@ #ifndef SPRITE_2D_H #define SPRITE_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/variant/dictionary.h" #include "scene/2d/node_2d.h" #include "scene/resources/texture.h" +class Texture2D; + class Sprite2D : public Node2D { GDCLASS(Sprite2D, Node2D); diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 02ca1ba2aaa5..87e1b916e5f9 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -30,9 +30,33 @@ #include "tile_map.h" -#include "core/io/marshalls.h" +#include +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/io/marshalls.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/random_pcg.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/templates/pair.h" +#include "core/variant/array.h" +#include "scene/2d/light_occluder_2d.h" +#include "scene/2d/navigation_region_2d.h" +#include "scene/gui/control.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/resources/convex_polygon_shape_2d.h" +#include "scene/resources/material.h" +#include "scene/resources/packed_scene.h" +#include "scene/resources/physics_material.h" +#include "scene/resources/texture.h" +#include "scene/resources/world_2d.h" #include "servers/navigation_server_2d.h" +#include "servers/physics_server_2d.h" +#include "servers/rendering_server.h" Map TileMap::TerrainConstraint::get_overlapping_coords_and_peering_bits() const { Map output; diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h index 0da04bfeae40..d6c127f7bfca 100644 --- a/scene/2d/tile_map.h +++ b/scene/2d/tile_map.h @@ -31,11 +31,36 @@ #ifndef TILE_MAP_H #define TILE_MAP_H +#include "core/math/color.h" +#include "core/math/rect2.h" +#include "core/math/rect2i.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/local_vector.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" +#include "core/templates/self_list.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/2d/node_2d.h" #include "scene/gui/control.h" +#include "scene/main/canvas_item.h" #include "scene/resources/tile_set.h" class TileSetAtlasSource; +class Control; +class Material; struct TileMapQuadrant { struct CoordsWorldComparator { diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp index ff186b01f26b..2e884276c8a7 100644 --- a/scene/2d/touch_screen_button.cpp +++ b/scene/2d/touch_screen_button.cpp @@ -30,7 +30,21 @@ #include "touch_screen_button.h" -#include "scene/main/window.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/input/input.h" +#include "core/input/input_event.h" +#include "core/math/color.h" +#include "core/math/transform_2d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/main/viewport.h" +#include "servers/display_server.h" void TouchScreenButton::set_texture_normal(const Ref &p_texture) { texture_normal = p_texture; diff --git a/scene/2d/touch_screen_button.h b/scene/2d/touch_screen_button.h index e7f6da9f50e4..2bde9fb2ddd2 100644 --- a/scene/2d/touch_screen_button.h +++ b/scene/2d/touch_screen_button.h @@ -31,11 +31,21 @@ #ifndef TOUCH_SCREEN_BUTTON_H #define TOUCH_SCREEN_BUTTON_H +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/variant/binder_common.h" #include "scene/2d/node_2d.h" #include "scene/resources/bit_map.h" #include "scene/resources/rectangle_shape_2d.h" +#include "scene/resources/shape_2d.h" #include "scene/resources/texture.h" +class InputEvent; + class TouchScreenButton : public Node2D { GDCLASS(TouchScreenButton, Node2D); diff --git a/scene/2d/visible_on_screen_notifier_2d.cpp b/scene/2d/visible_on_screen_notifier_2d.cpp index a7c2ae5bb198..f071bab0b04d 100644 --- a/scene/2d/visible_on_screen_notifier_2d.cpp +++ b/scene/2d/visible_on_screen_notifier_2d.cpp @@ -30,7 +30,16 @@ #include "visible_on_screen_notifier_2d.h" +#include "core/config/engine.h" +#include "core/math/color.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/variant/callable.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" #include "scene/scene_string_names.h" +#include "servers/rendering_server.h" #ifdef TOOLS_ENABLED Rect2 VisibleOnScreenNotifier2D::_edit_get_rect() const { diff --git a/scene/2d/visible_on_screen_notifier_2d.h b/scene/2d/visible_on_screen_notifier_2d.h index e0d580f17449..0ee87dd642df 100644 --- a/scene/2d/visible_on_screen_notifier_2d.h +++ b/scene/2d/visible_on_screen_notifier_2d.h @@ -31,9 +31,16 @@ #ifndef VISIBLE_ON_SCREEN_NOTIFIER_2D_H #define VISIBLE_ON_SCREEN_NOTIFIER_2D_H +#include "core/math/rect2.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/templates/set.h" +#include "core/variant/binder_common.h" #include "scene/2d/node_2d.h" class Viewport; + class VisibleOnScreenNotifier2D : public Node2D { GDCLASS(VisibleOnScreenNotifier2D, Node2D); diff --git a/scene/3d/area_3d.cpp b/scene/3d/area_3d.cpp index 5123a6eb6ccc..5ed2e43e458a 100644 --- a/scene/3d/area_3d.cpp +++ b/scene/3d/area_3d.cpp @@ -30,8 +30,22 @@ #include "area_3d.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/transform_3d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/pair.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/callable.h" +#include "core/variant/variant.h" +#include "scene/3d/node_3d.h" +#include "scene/main/node.h" #include "scene/scene_string_names.h" #include "servers/audio_server.h" +#include "servers/physics_server_3d.h" void Area3D::set_gravity_space_override_mode(SpaceOverride p_mode) { gravity_space_override = p_mode; diff --git a/scene/3d/area_3d.h b/scene/3d/area_3d.h index c2399985ffa3..e4f7e205dbec 100644 --- a/scene/3d/area_3d.h +++ b/scene/3d/area_3d.h @@ -31,9 +31,22 @@ #ifndef AREA_3D_H #define AREA_3D_H +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" #include "core/templates/vset.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/3d/collision_object_3d.h" +class Node3D; +class Node; + class Area3D : public CollisionObject3D { GDCLASS(Area3D, CollisionObject3D); diff --git a/scene/3d/audio_listener_3d.cpp b/scene/3d/audio_listener_3d.cpp index 0eb758895895..bb1f713c11dc 100644 --- a/scene/3d/audio_listener_3d.cpp +++ b/scene/3d/audio_listener_3d.cpp @@ -30,6 +30,8 @@ #include "audio_listener_3d.h" +#include "core/object/class_db.h" +#include "scene/main/scene_tree.h" #include "scene/main/viewport.h" void AudioListener3D::_update_audio_listener_state() { diff --git a/scene/3d/audio_listener_3d.h b/scene/3d/audio_listener_3d.h index ebc37673ed12..d2ceae26e192 100644 --- a/scene/3d/audio_listener_3d.h +++ b/scene/3d/audio_listener_3d.h @@ -31,6 +31,12 @@ #ifndef LISTENER_3D_H #define LISTENER_3D_H +#include "core/math/transform_3d.h" +#include "core/object/object.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/variant/variant.h" #include "scene/3d/node_3d.h" class AudioListener3D : public Node3D { diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index 3b52974b8e8b..99406f671eca 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -30,10 +30,32 @@ #include "audio_stream_player_3d.h" +#include + +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/audio_frame.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/map.h" +#include "core/templates/set.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "scene/3d/area_3d.h" #include "scene/3d/audio_listener_3d.h" #include "scene/3d/camera_3d.h" +#include "scene/3d/velocity_tracker_3d.h" +#include "scene/main/node.h" #include "scene/main/viewport.h" +#include "scene/resources/world_3d.h" +#include "servers/audio/audio_stream.h" +#include "servers/audio_server.h" +#include "servers/physics_server_3d.h" // Based on "A Novel Multichannel Panning Method for Standard and Arbitrary Loudspeaker Configurations" by Ramy Sadek and Chris Kyriakakis (2004) // Speaker-Placement Correction Amplitude Panning (SPCAP) diff --git a/scene/3d/audio_stream_player_3d.h b/scene/3d/audio_stream_player_3d.h index 53cdd2e6305e..77748a75d1fb 100644 --- a/scene/3d/audio_stream_player_3d.h +++ b/scene/3d/audio_stream_player_3d.h @@ -31,7 +31,17 @@ #ifndef AUDIO_STREAM_PLAYER_3D_H #define AUDIO_STREAM_PLAYER_3D_H +#include + +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "core/os/mutex.h" +#include "core/string/string_name.h" +#include "core/templates/safe_refcount.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" #include "scene/3d/area_3d.h" #include "scene/3d/node_3d.h" #include "scene/3d/velocity_tracker_3d.h" @@ -40,6 +50,12 @@ #include "servers/audio_server.h" class Camera3D; +class Area3D; +class AudioStream; +class AudioStreamPlayback; +class VelocityTracker3D; +struct AudioFrame; + class AudioStreamPlayer3D : public Node3D { GDCLASS(AudioStreamPlayer3D, Node3D); diff --git a/scene/3d/bone_attachment_3d.cpp b/scene/3d/bone_attachment_3d.cpp index 73a4dcd1f785..46bfef9b0bf1 100644 --- a/scene/3d/bone_attachment_3d.cpp +++ b/scene/3d/bone_attachment_3d.cpp @@ -30,6 +30,13 @@ #include "bone_attachment_3d.h" +#include "core/error/error_macros.h" +#include "core/math/transform_3d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "scene/3d/skeleton_3d.h" +#include "scene/main/node.h" + void BoneAttachment3D::_validate_property(PropertyInfo &property) const { if (property.name == "bone_name") { // Because it is a constant function, we cannot use the _get_skeleton_3d function. diff --git a/scene/3d/bone_attachment_3d.h b/scene/3d/bone_attachment_3d.h index 395dfde1d707..3d161c9522b7 100644 --- a/scene/3d/bone_attachment_3d.h +++ b/scene/3d/bone_attachment_3d.h @@ -31,8 +31,19 @@ #ifndef BONE_ATTACHMENT_H #define BONE_ATTACHMENT_H +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" +#include "scene/3d/node_3d.h" #include "scene/3d/skeleton_3d.h" +class Skeleton3D; + class BoneAttachment3D : public Node3D { GDCLASS(BoneAttachment3D, Node3D); diff --git a/scene/3d/camera_3d.cpp b/scene/3d/camera_3d.cpp index 2c95010eb407..e4bd36cbcb7b 100644 --- a/scene/3d/camera_3d.cpp +++ b/scene/3d/camera_3d.cpp @@ -30,9 +30,24 @@ #include "camera_3d.h" -#include "collision_object_3d.h" +#include + +#include "core/error/error_macros.h" +#include "core/math/basis.h" #include "core/math/camera_matrix.h" +#include "core/math/plane.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/3d/velocity_tracker_3d.h" +#include "scene/main/scene_tree.h" #include "scene/main/viewport.h" +#include "scene/resources/camera_effects.h" +#include "scene/resources/environment.h" +#include "scene/resources/world_3d.h" +#include "servers/physics_server_3d.h" +#include "servers/rendering_server.h" void Camera3D::_update_audio_listener_state() { } diff --git a/scene/3d/camera_3d.h b/scene/3d/camera_3d.h index b5665814c7d3..b8bf5d9eceb8 100644 --- a/scene/3d/camera_3d.h +++ b/scene/3d/camera_3d.h @@ -31,9 +31,26 @@ #ifndef CAMERA_3D_H #define CAMERA_3D_H +#include + +#include "core/math/math_defs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" #include "scene/3d/node_3d.h" #include "scene/3d/velocity_tracker_3d.h" +class CameraEffects; +class Environment; +class VelocityTracker3D; +class Viewport; +struct Plane; + class Camera3D : public Node3D { GDCLASS(Camera3D, Node3D); diff --git a/scene/3d/collision_object_3d.cpp b/scene/3d/collision_object_3d.cpp index 3ab09550fab1..0eb3142137fb 100644 --- a/scene/3d/collision_object_3d.cpp +++ b/scene/3d/collision_object_3d.cpp @@ -30,7 +30,23 @@ #include "collision_object_3d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/input/input_event.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/object/script_language.h" +#include "core/string/ustring.h" +#include "core/templates/pair.h" +#include "core/variant/callable.h" +#include "core/variant/variant.h" +#include "scene/3d/camera_3d.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/resources/mesh.h" +#include "scene/resources/world_3d.h" #include "scene/scene_string_names.h" +#include "servers/rendering_server.h" void CollisionObject3D::_notification(int p_what) { switch (p_what) { diff --git a/scene/3d/collision_object_3d.h b/scene/3d/collision_object_3d.h index e92843d7848d..fce49847ad2c 100644 --- a/scene/3d/collision_object_3d.h +++ b/scene/3d/collision_object_3d.h @@ -31,8 +31,32 @@ #ifndef COLLISION_OBJECT_3D_H #define COLLISION_OBJECT_3D_H +#include + +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/3d/camera_3d.h" #include "scene/3d/node_3d.h" +#include "scene/resources/shape_3d.h" +#include "servers/physics_server_3d.h" + +class Camera3D; +class InputEvent; +class String; class CollisionObject3D : public Node3D { GDCLASS(CollisionObject3D, Node3D); diff --git a/scene/3d/collision_polygon_3d.cpp b/scene/3d/collision_polygon_3d.cpp index 79261754595d..2a7914f25b1f 100644 --- a/scene/3d/collision_polygon_3d.cpp +++ b/scene/3d/collision_polygon_3d.cpp @@ -32,7 +32,14 @@ #include "collision_object_3d.h" #include "core/math/geometry_2d.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/node.h" #include "scene/resources/convex_polygon_shape_3d.h" +#include "scene/resources/shape_3d.h" void CollisionPolygon3D::_build_polygon() { if (!parent) { diff --git a/scene/3d/collision_polygon_3d.h b/scene/3d/collision_polygon_3d.h index a24d485af270..611541bd3feb 100644 --- a/scene/3d/collision_polygon_3d.h +++ b/scene/3d/collision_polygon_3d.h @@ -31,10 +31,21 @@ #ifndef COLLISION_POLYGON_3D_H #define COLLISION_POLYGON_3D_H +#include + +#include "core/math/aabb.h" +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/templates/vector.h" +#include "core/variant/typed_array.h" #include "scene/3d/node_3d.h" #include "scene/resources/shape_3d.h" class CollisionObject3D; +class String; + class CollisionPolygon3D : public Node3D { GDCLASS(CollisionPolygon3D, Node3D); real_t margin = 0.04; diff --git a/scene/3d/collision_shape_3d.cpp b/scene/3d/collision_shape_3d.cpp index 773095b377e3..b6e02d0648dc 100644 --- a/scene/3d/collision_shape_3d.cpp +++ b/scene/3d/collision_shape_3d.cpp @@ -30,10 +30,23 @@ #include "collision_shape_3d.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/object/method_bind.h" +#include "core/os/memory.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" #include "mesh_instance_3d.h" #include "physics_body_3d.h" +#include "scene/3d/collision_object_3d.h" +#include "scene/main/node.h" #include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/convex_polygon_shape_3d.h" +#include "scene/resources/mesh.h" +#include "scene/resources/shape_3d.h" +#include "servers/rendering_server.h" void CollisionShape3D::make_convex_from_siblings() { Node *p = get_parent(); diff --git a/scene/3d/collision_shape_3d.h b/scene/3d/collision_shape_3d.h index bd5595f97410..aec80bb5d2a0 100644 --- a/scene/3d/collision_shape_3d.h +++ b/scene/3d/collision_shape_3d.h @@ -31,10 +31,19 @@ #ifndef COLLISION_SHAPE_H #define COLLISION_SHAPE_H +#include + +#include "core/io/resource.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/variant/typed_array.h" #include "scene/3d/node_3d.h" #include "scene/resources/shape_3d.h" class CollisionObject3D; +class Shape3D; + class CollisionShape3D : public Node3D { GDCLASS(CollisionShape3D, Node3D); OBJ_CATEGORY("3D Physics Nodes"); diff --git a/scene/3d/cpu_particles_3d.cpp b/scene/3d/cpu_particles_3d.cpp index e3d551d78220..e7e411b14c6d 100644 --- a/scene/3d/cpu_particles_3d.cpp +++ b/scene/3d/cpu_particles_3d.cpp @@ -30,10 +30,31 @@ #include "cpu_particles_3d.h" +#include + +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/face3.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/sort_array.h" +#include "core/variant/variant.h" #include "scene/3d/camera_3d.h" #include "scene/3d/gpu_particles_3d.h" +#include "scene/3d/node_3d.h" +#include "scene/main/node.h" #include "scene/main/viewport.h" +#include "scene/resources/curve.h" +#include "scene/resources/gradient.h" +#include "scene/resources/material.h" +#include "scene/resources/mesh.h" #include "scene/resources/particles_material.h" +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" AABB CPUParticles3D::get_aabb() const { return AABB(); diff --git a/scene/3d/cpu_particles_3d.h b/scene/3d/cpu_particles_3d.h index bd736bdf2485..ec8479bb8fc0 100644 --- a/scene/3d/cpu_particles_3d.h +++ b/scene/3d/cpu_particles_3d.h @@ -31,8 +31,30 @@ #ifndef CPU_PARTICLES_H #define CPU_PARTICLES_H +#include + +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/mutex.h" +#include "core/templates/rid.h" +#include "core/templates/safe_refcount.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/3d/visual_instance_3d.h" +class Curve; +class Gradient; +class Mesh; +class Node; +class String; +struct Face3; + class CPUParticles3D : public GeometryInstance3D { private: GDCLASS(CPUParticles3D, GeometryInstance3D); diff --git a/scene/3d/decal.cpp b/scene/3d/decal.cpp index dfac9055f527..ed0920863d2f 100644 --- a/scene/3d/decal.cpp +++ b/scene/3d/decal.cpp @@ -30,6 +30,15 @@ #include "decal.h" +#include "core/error/error_macros.h" +#include "core/math/face3.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/node.h" +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" + void Decal::set_extents(const Vector3 &p_extents) { extents = p_extents; RS::get_singleton()->decal_set_extents(decal, p_extents); diff --git a/scene/3d/decal.h b/scene/3d/decal.h index 740dd2c40778..7c605eececa9 100644 --- a/scene/3d/decal.h +++ b/scene/3d/decal.h @@ -31,8 +31,24 @@ #ifndef DECAL_H #define DECAL_H +#include + +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/3d/visual_instance_3d.h" +class String; +class Texture2D; +struct Face3; + class Decal : public VisualInstance3D { GDCLASS(Decal, VisualInstance3D); diff --git a/scene/3d/fog_volume.cpp b/scene/3d/fog_volume.cpp index 8d05254a25c8..a45da01295a7 100644 --- a/scene/3d/fog_volume.cpp +++ b/scene/3d/fog_volume.cpp @@ -30,6 +30,15 @@ #include "fog_volume.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/node.h" +#include "scene/main/viewport.h" +#include "scene/resources/environment.h" +#include "scene/resources/material.h" +#include "scene/resources/world_3d.h" + /////////////////////////// void FogVolume::_bind_methods() { diff --git a/scene/3d/fog_volume.h b/scene/3d/fog_volume.h index 68d5c58169e2..00bc8473800c 100644 --- a/scene/3d/fog_volume.h +++ b/scene/3d/fog_volume.h @@ -31,11 +31,25 @@ #ifndef FOG_VOLUME_H #define FOG_VOLUME_H +#include + +#include "core/math/aabb.h" +#include "core/math/face3.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/typed_array.h" #include "scene/3d/visual_instance_3d.h" #include "scene/main/node.h" #include "scene/main/viewport.h" #include "scene/resources/material.h" +#include "servers/rendering_server.h" + +class Material; +class String; class FogVolume : public VisualInstance3D { GDCLASS(FogVolume, VisualInstance3D); diff --git a/scene/3d/gpu_particles_3d.cpp b/scene/3d/gpu_particles_3d.cpp index aaaa7288382c..1e34e6bcfd42 100644 --- a/scene/3d/gpu_particles_3d.cpp +++ b/scene/3d/gpu_particles_3d.cpp @@ -30,7 +30,20 @@ #include "gpu_particles_3d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/face3.h" +#include "core/math/transform_3d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/3d/node_3d.h" +#include "scene/main/node.h" +#include "scene/resources/material.h" +#include "scene/resources/mesh.h" #include "scene/resources/particles_material.h" +#include "scene/resources/skin.h" AABB GPUParticles3D::get_aabb() const { return AABB(); diff --git a/scene/3d/gpu_particles_3d.h b/scene/3d/gpu_particles_3d.h index 54ae84628a45..ca84a9fe7497 100644 --- a/scene/3d/gpu_particles_3d.h +++ b/scene/3d/gpu_particles_3d.h @@ -31,8 +31,29 @@ #ifndef PARTICLES_H #define PARTICLES_H +#include + +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/3d/visual_instance_3d.h" #include "scene/resources/skin.h" +#include "servers/rendering_server.h" + +class Material; +class Mesh; +class Skin; +class String; +struct Face3; +struct Transform3D; class GPUParticles3D : public GeometryInstance3D { private: diff --git a/scene/3d/gpu_particles_collision_3d.cpp b/scene/3d/gpu_particles_collision_3d.cpp index 54fbc720ce27..4bb89b991b6d 100644 --- a/scene/3d/gpu_particles_collision_3d.cpp +++ b/scene/3d/gpu_particles_collision_3d.cpp @@ -30,9 +30,25 @@ #include "gpu_particles_collision_3d.h" +#include "core/error/error_macros.h" +#include "core/io/image.h" +#include "core/math/basis.h" +#include "core/math/geometry_3d.h" +#include "core/math/math_funcs.h" +#include "core/math/plane.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/os/os.h" +#include "core/templates/sort_array.h" +#include "core/templates/thread_work_pool.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" #include "mesh_instance_3d.h" #include "scene/3d/camera_3d.h" +#include "scene/3d/node_3d.h" +#include "scene/main/node.h" #include "scene/main/viewport.h" +#include "scene/resources/texture.h" void GPUParticlesCollision3D::set_cull_mask(uint32_t p_cull_mask) { cull_mask = p_cull_mask; diff --git a/scene/3d/gpu_particles_collision_3d.h b/scene/3d/gpu_particles_collision_3d.h index b6de1d83fc19..d682af1a9865 100644 --- a/scene/3d/gpu_particles_collision_3d.h +++ b/scene/3d/gpu_particles_collision_3d.h @@ -31,8 +31,30 @@ #ifndef GPU_PARTICLES_COLLISION_3D_H #define GPU_PARTICLES_COLLISION_3D_H +#include + +#include "core/math/aabb.h" +#include "core/math/face3.h" +#include "core/math/math_defs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/math/vector3i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/list.h" #include "core/templates/local_vector.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" #include "scene/3d/visual_instance_3d.h" +#include "scene/resources/mesh.h" +#include "servers/rendering_server.h" + +class Image; +class Node; +class String; +class Texture3D; class GPUParticlesCollision3D : public VisualInstance3D { GDCLASS(GPUParticlesCollision3D, VisualInstance3D); diff --git a/scene/3d/importer_mesh_instance_3d.cpp b/scene/3d/importer_mesh_instance_3d.cpp index 7cd6a8153267..6ace1d26aa62 100644 --- a/scene/3d/importer_mesh_instance_3d.cpp +++ b/scene/3d/importer_mesh_instance_3d.cpp @@ -30,6 +30,9 @@ #include "importer_mesh_instance_3d.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" #include "scene/resources/importer_mesh.h" void ImporterMeshInstance3D::set_mesh(const Ref &p_mesh) { diff --git a/scene/3d/importer_mesh_instance_3d.h b/scene/3d/importer_mesh_instance_3d.h index 3daf06771d30..87b5f66dd18a 100644 --- a/scene/3d/importer_mesh_instance_3d.h +++ b/scene/3d/importer_mesh_instance_3d.h @@ -31,8 +31,14 @@ #ifndef SCENE_IMPORTER_MESH_INSTANCE_3D_H #define SCENE_IMPORTER_MESH_INSTANCE_3D_H +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/templates/vector.h" #include "scene/3d/node_3d.h" #include "scene/resources/immediate_mesh.h" +#include "scene/resources/importer_mesh.h" +#include "scene/resources/material.h" #include "scene/resources/skin.h" class ImporterMesh; diff --git a/scene/3d/joint_3d.cpp b/scene/3d/joint_3d.cpp index bd47ab3462d8..f407bf16e93d 100644 --- a/scene/3d/joint_3d.cpp +++ b/scene/3d/joint_3d.cpp @@ -30,6 +30,15 @@ #include "joint_3d.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/3d/physics_body_3d.h" +#include "scene/main/node.h" #include "scene/scene_string_names.h" void Joint3D::_disconnect_signals() { diff --git a/scene/3d/joint_3d.h b/scene/3d/joint_3d.h index ea356ef3b780..002fe53e85fb 100644 --- a/scene/3d/joint_3d.h +++ b/scene/3d/joint_3d.h @@ -31,8 +31,19 @@ #ifndef JOINT_3D_H #define JOINT_3D_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/string/node_path.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/3d/node_3d.h" #include "scene/3d/physics_body_3d.h" +#include "servers/physics_server_3d.h" + +class PhysicsBody3D; class Joint3D : public Node3D { GDCLASS(Joint3D, Node3D); diff --git a/scene/3d/light_3d.cpp b/scene/3d/light_3d.cpp index d88bb815bc3a..9a5bfe93ffa4 100644 --- a/scene/3d/light_3d.cpp +++ b/scene/3d/light_3d.cpp @@ -30,6 +30,18 @@ #include "light_3d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/face3.h" +#include "core/math/math_funcs.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/3d/node_3d.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/resources/texture.h" + void Light3D::set_param(Param p_param, real_t p_value) { ERR_FAIL_INDEX(p_param, PARAM_MAX); param[p_param] = p_value; diff --git a/scene/3d/light_3d.h b/scene/3d/light_3d.h index d5d2aee43de6..9ae800cdf092 100644 --- a/scene/3d/light_3d.h +++ b/scene/3d/light_3d.h @@ -31,7 +31,23 @@ #ifndef LIGHT_3D_H #define LIGHT_3D_H +#include + +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/3d/visual_instance_3d.h" +#include "servers/rendering_server.h" + +class Texture2D; +struct Face3; class Light3D : public VisualInstance3D { GDCLASS(Light3D, VisualInstance3D); diff --git a/scene/3d/lightmap_gi.cpp b/scene/3d/lightmap_gi.cpp index 825742da35bd..55c637f390f6 100644 --- a/scene/3d/lightmap_gi.cpp +++ b/scene/3d/lightmap_gi.cpp @@ -30,10 +30,32 @@ #include "lightmap_gi.h" +#include "core/error/error_list.h" +#include "core/error/error_macros.h" #include "core/io/config_file.h" +#include "core/io/file_access.h" +#include "core/io/image.h" +#include "core/io/resource_loader.h" +#include "core/io/resource_saver.h" +#include "core/math/basis.h" #include "core/math/delaunay_3d.h" +#include "core/math/face3.h" +#include "core/math/geometry_3d.h" +#include "core/math/math_funcs.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/typed_array.h" #include "lightmap_probe.h" +#include "scene/3d/light_3d.h" #include "scene/3d/mesh_instance_3d.h" +#include "scene/3d/node_3d.h" +#include "scene/main/node.h" +#include "scene/resources/environment.h" +#include "scene/resources/texture.h" +#include "scene/resources/world_3d.h" +#include "servers/rendering_server.h" void LightmapGIData::add_user(const NodePath &p_path, const Rect2 &p_uv_scale, int p_slice_index, int32_t p_sub_instance) { User user; diff --git a/scene/3d/lightmap_gi.h b/scene/3d/lightmap_gi.h index 66acf4f487b5..3315ec6b2f03 100644 --- a/scene/3d/lightmap_gi.h +++ b/scene/3d/lightmap_gi.h @@ -31,10 +31,42 @@ #ifndef LIGHTMAP_GI_H #define LIGHTMAP_GI_H +#include + +#include "core/io/resource.h" +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/plane.h" +#include "core/math/rect2.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/memory.h" +#include "core/string/node_path.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/hashfuncs.h" #include "core/templates/local_vector.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/3d/light_3d.h" #include "scene/3d/lightmapper.h" #include "scene/3d/visual_instance_3d.h" +#include "scene/resources/material.h" +#include "scene/resources/mesh.h" +#include "scene/resources/sky.h" + +class Light3D; +class Node; +class TextureLayered; +struct Face3; +struct Vector3; class LightmapGIData : public Resource { GDCLASS(LightmapGIData, Resource); diff --git a/scene/3d/lightmap_probe.h b/scene/3d/lightmap_probe.h index 11b35451a1ff..8b12e8156896 100644 --- a/scene/3d/lightmap_probe.h +++ b/scene/3d/lightmap_probe.h @@ -31,6 +31,7 @@ #ifndef LIGHTMAP_PROBE_H #define LIGHTMAP_PROBE_H +#include "core/object/object.h" #include "scene/3d/node_3d.h" class LightmapProbe : public Node3D { diff --git a/scene/3d/mesh_instance_3d.cpp b/scene/3d/mesh_instance_3d.cpp index 58ff512130e5..66468507c043 100644 --- a/scene/3d/mesh_instance_3d.cpp +++ b/scene/3d/mesh_instance_3d.cpp @@ -32,7 +32,29 @@ #include "collision_shape_3d.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/face3.h" +#include "core/math/vector3.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/object/method_bind.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/templates/pair.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/array.h" #include "physics_body_3d.h" +#include "scene/3d/skeleton_3d.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/resources/material.h" +#include "scene/resources/mesh.h" +#include "scene/resources/skin.h" +#include "servers/rendering_server.h" + +class Shape3D; bool MeshInstance3D::_set(const StringName &p_name, const Variant &p_value) { //this is not _too_ bad performance wise, really. it only arrives here if the property was not set anywhere else. diff --git a/scene/3d/mesh_instance_3d.h b/scene/3d/mesh_instance_3d.h index 03ee3cd60895..6ecb2ae3a7bb 100644 --- a/scene/3d/mesh_instance_3d.h +++ b/scene/3d/mesh_instance_3d.h @@ -31,10 +31,26 @@ #ifndef MESH_INSTANCE_H #define MESH_INSTANCE_H +#include + +#include "core/math/aabb.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" #include "core/templates/local_vector.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" #include "scene/3d/visual_instance_3d.h" + class Skin; class SkinReference; +class Material; +class Mesh; +class Node; +struct Face3; class MeshInstance3D : public GeometryInstance3D { GDCLASS(MeshInstance3D, GeometryInstance3D); diff --git a/scene/3d/multimesh_instance_3d.cpp b/scene/3d/multimesh_instance_3d.cpp index 34b1e8643516..1c0e55c6e1ac 100644 --- a/scene/3d/multimesh_instance_3d.cpp +++ b/scene/3d/multimesh_instance_3d.cpp @@ -30,6 +30,12 @@ #include "multimesh_instance_3d.h" +#include "core/math/face3.h" +#include "core/object/class_db.h" +#include "core/templates/rid.h" +#include "core/variant/variant.h" +#include "scene/resources/multimesh.h" + void MultiMeshInstance3D::_bind_methods() { ClassDB::bind_method(D_METHOD("set_multimesh", "multimesh"), &MultiMeshInstance3D::set_multimesh); ClassDB::bind_method(D_METHOD("get_multimesh"), &MultiMeshInstance3D::get_multimesh); diff --git a/scene/3d/multimesh_instance_3d.h b/scene/3d/multimesh_instance_3d.h index d03b24eb4ee5..cd4143257081 100644 --- a/scene/3d/multimesh_instance_3d.h +++ b/scene/3d/multimesh_instance_3d.h @@ -31,9 +31,18 @@ #ifndef MULTIMESH_INSTANCE_3D_H #define MULTIMESH_INSTANCE_3D_H +#include + +#include "core/math/aabb.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/vector.h" #include "scene/3d/visual_instance_3d.h" #include "scene/resources/multimesh.h" +class MultiMesh; +struct Face3; + class MultiMeshInstance3D : public GeometryInstance3D { GDCLASS(MultiMeshInstance3D, GeometryInstance3D); diff --git a/scene/3d/navigation_agent_3d.cpp b/scene/3d/navigation_agent_3d.cpp index e90971845e01..d755e582af92 100644 --- a/scene/3d/navigation_agent_3d.cpp +++ b/scene/3d/navigation_agent_3d.cpp @@ -30,6 +30,17 @@ #include "navigation_agent_3d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/geometry_3d.h" +#include "core/math/transform_3d.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/3d/node_3d.h" +#include "scene/resources/world_3d.h" #include "servers/navigation_server_3d.h" void NavigationAgent3D::_bind_methods() { diff --git a/scene/3d/navigation_agent_3d.h b/scene/3d/navigation_agent_3d.h index aebd5be7e42a..2a9909b1b611 100644 --- a/scene/3d/navigation_agent_3d.h +++ b/scene/3d/navigation_agent_3d.h @@ -31,9 +31,18 @@ #ifndef NAVIGATION_AGENT_H #define NAVIGATION_AGENT_H +#include + +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/typed_array.h" #include "scene/main/node.h" class Node3D; +class String; class NavigationAgent3D : public Node { GDCLASS(NavigationAgent3D, Node); diff --git a/scene/3d/navigation_obstacle_3d.cpp b/scene/3d/navigation_obstacle_3d.cpp index ba6c50d98c6b..b0a7075b9864 100644 --- a/scene/3d/navigation_obstacle_3d.cpp +++ b/scene/3d/navigation_obstacle_3d.cpp @@ -30,8 +30,20 @@ #include "navigation_obstacle_3d.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "scene/3d/collision_shape_3d.h" +#include "scene/3d/node_3d.h" #include "scene/3d/physics_body_3d.h" +#include "scene/resources/shape_3d.h" +#include "scene/resources/world_3d.h" #include "servers/navigation_server_3d.h" void NavigationObstacle3D::_bind_methods() { diff --git a/scene/3d/navigation_obstacle_3d.h b/scene/3d/navigation_obstacle_3d.h index 542d603a0a18..4b143a197dea 100644 --- a/scene/3d/navigation_obstacle_3d.h +++ b/scene/3d/navigation_obstacle_3d.h @@ -31,7 +31,15 @@ #ifndef NAVIGATION_OBSTACLE_H #define NAVIGATION_OBSTACLE_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/templates/rid.h" +#include "core/variant/typed_array.h" #include "scene/3d/node_3d.h" +#include "scene/main/node.h" + +class Node3D; +class String; class NavigationObstacle3D : public Node { GDCLASS(NavigationObstacle3D, Node); diff --git a/scene/3d/navigation_region_3d.cpp b/scene/3d/navigation_region_3d.cpp index 1e298e013759..b27de143a358 100644 --- a/scene/3d/navigation_region_3d.cpp +++ b/scene/3d/navigation_region_3d.cpp @@ -30,7 +30,18 @@ #include "navigation_region_3d.h" +#include "core/error/error_macros.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" #include "mesh_instance_3d.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/resources/navigation_mesh.h" +#include "scene/resources/world_3d.h" #include "servers/navigation_server_3d.h" void NavigationRegion3D::set_enabled(bool p_enabled) { diff --git a/scene/3d/navigation_region_3d.h b/scene/3d/navigation_region_3d.h index 1a50bb5f6436..9bb84ffeb82e 100644 --- a/scene/3d/navigation_region_3d.h +++ b/scene/3d/navigation_region_3d.h @@ -31,9 +31,20 @@ #ifndef NAVIGATION_REGION_H #define NAVIGATION_REGION_H +#include + +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/thread.h" +#include "core/templates/rid.h" +#include "core/variant/typed_array.h" #include "scene/3d/node_3d.h" #include "scene/resources/navigation_mesh.h" +class NavigationMesh; +class Node; +class String; + class NavigationRegion3D : public Node3D { GDCLASS(NavigationRegion3D, Node3D); diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp index cad1201d63ec..8dc860ac3061 100644 --- a/scene/3d/node_3d.cpp +++ b/scene/3d/node_3d.cpp @@ -30,11 +30,20 @@ #include "node_3d.h" +#include + +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" +#include "core/object/script_language.h" #include "scene/3d/visual_instance_3d.h" #include "scene/main/viewport.h" #include "scene/property_utils.h" +#include "scene/resources/world_3d.h" #include "scene/scene_string_names.h" +#include "servers/rendering_server.h" /* diff --git a/scene/3d/node_3d.h b/scene/3d/node_3d.h index 4abda661871d..f2fdebb9ec5c 100644 --- a/scene/3d/node_3d.h +++ b/scene/3d/node_3d.h @@ -31,7 +31,28 @@ #ifndef NODE_3D_H #define NODE_3D_H +#include "core/math/basis.h" +#include "core/math/math_defs.h" +#include "core/math/quaternion.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/self_list.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/main/node.h" +#include "scene/main/scene_tree.h" + +class Viewport; +class World3D; class Node3DGizmo : public RefCounted { GDCLASS(Node3DGizmo, RefCounted); diff --git a/scene/3d/occluder_instance_3d.cpp b/scene/3d/occluder_instance_3d.cpp index e0e2eae4a533..329f5d89286d 100644 --- a/scene/3d/occluder_instance_3d.cpp +++ b/scene/3d/occluder_instance_3d.cpp @@ -29,8 +29,21 @@ /*************************************************************************/ #include "occluder_instance_3d.h" + +#include "core/config/project_settings.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/math/face3.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/variant/array.h" #include "scene/3d/mesh_instance_3d.h" +#include "scene/main/node.h" +#include "scene/resources/material.h" +#include "scene/resources/mesh.h" +#include "servers/rendering_server.h" RID Occluder3D::get_rid() const { if (!occluder.is_valid()) { diff --git a/scene/3d/occluder_instance_3d.h b/scene/3d/occluder_instance_3d.h index 8a8d4c9af441..35af56265564 100644 --- a/scene/3d/occluder_instance_3d.h +++ b/scene/3d/occluder_instance_3d.h @@ -31,8 +31,26 @@ #ifndef OCCLUDER_INSTANCE_3D_H #define OCCLUDER_INSTANCE_3D_H +#include + +#include "core/io/resource.h" +#include "core/math/aabb.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" +#include "scene/3d/node_3d.h" #include "scene/3d/visual_instance_3d.h" +class ArrayMesh; +class Material; +class Node; +struct Face3; +struct Vector3; + class Occluder3D : public Resource { GDCLASS(Occluder3D, Resource); RES_BASE_EXTENSION("occ"); diff --git a/scene/3d/path_3d.cpp b/scene/3d/path_3d.cpp index 6e1c9ef78106..7b1daaa7942c 100644 --- a/scene/3d/path_3d.cpp +++ b/scene/3d/path_3d.cpp @@ -30,6 +30,19 @@ #include "path_3d.h" +#include "core/config/engine.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/node.h" + void Path3D::_notification(int p_what) { } diff --git a/scene/3d/path_3d.h b/scene/3d/path_3d.h index 32ca5a1beb9b..c738a37dd5ad 100644 --- a/scene/3d/path_3d.h +++ b/scene/3d/path_3d.h @@ -31,9 +31,16 @@ #ifndef PATH_H #define PATH_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/3d/node_3d.h" #include "scene/resources/curve.h" +class String; + class Path3D : public Node3D { GDCLASS(Path3D, Node3D); diff --git a/scene/3d/physics_body_3d.cpp b/scene/3d/physics_body_3d.cpp index 13a38f3b9f70..c7f81b367bd4 100644 --- a/scene/3d/physics_body_3d.cpp +++ b/scene/3d/physics_body_3d.cpp @@ -30,7 +30,18 @@ #include "physics_body_3d.h" +#include "core/config/engine.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/templates/pair.h" +#include "core/templates/set.h" +#include "core/typedefs.h" +#include "scene/3d/node_3d.h" +#include "scene/3d/skeleton_3d.h" +#include "scene/main/node.h" #include "scene/scene_string_names.h" void PhysicsBody3D::_bind_methods() { diff --git a/scene/3d/physics_body_3d.h b/scene/3d/physics_body_3d.h index 67dc7382c36e..4b3fd1e68329 100644 --- a/scene/3d/physics_body_3d.h +++ b/scene/3d/physics_body_3d.h @@ -31,13 +31,36 @@ #ifndef PHYSICS_BODY_3D_H #define PHYSICS_BODY_3D_H +#include + +#include "core/math/basis.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" #include "core/templates/vset.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/3d/collision_object_3d.h" #include "scene/resources/physics_material.h" #include "servers/physics_server_3d.h" #include "skeleton_3d.h" class KinematicCollision3D; +class Node; +class Skeleton3D; class PhysicsBody3D : public CollisionObject3D { GDCLASS(PhysicsBody3D, CollisionObject3D); diff --git a/scene/3d/position_3d.h b/scene/3d/position_3d.h index 5514399e6e6f..185b06e5fbbd 100644 --- a/scene/3d/position_3d.h +++ b/scene/3d/position_3d.h @@ -31,6 +31,7 @@ #ifndef POSITION_3D_H #define POSITION_3D_H +#include "core/object/object.h" #include "scene/3d/node_3d.h" class Position3D : public Node3D { diff --git a/scene/3d/ray_cast_3d.cpp b/scene/3d/ray_cast_3d.cpp index b71c54dcf95b..129b5cd91f54 100644 --- a/scene/3d/ray_cast_3d.cpp +++ b/scene/3d/ray_cast_3d.cpp @@ -30,8 +30,24 @@ #include "ray_cast_3d.h" +#include + #include "collision_object_3d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/math_defs.h" +#include "core/math/transform_3d.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/variant/array.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "mesh_instance_3d.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/resources/mesh.h" +#include "scene/resources/world_3d.h" +#include "servers/physics_server_3d.h" void RayCast3D::set_target_position(const Vector3 &p_point) { target_position = p_point; diff --git a/scene/3d/ray_cast_3d.h b/scene/3d/ray_cast_3d.h index ad85001591b8..433d87641ab2 100644 --- a/scene/3d/ray_cast_3d.h +++ b/scene/3d/ray_cast_3d.h @@ -31,9 +31,21 @@ #ifndef RAY_CAST_3D_H #define RAY_CAST_3D_H +#include + +#include "core/math/color.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/templates/rid.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" #include "scene/3d/node_3d.h" +#include "scene/resources/material.h" class CollisionObject3D; +class Node; class RayCast3D : public Node3D { GDCLASS(RayCast3D, Node3D); diff --git a/scene/3d/reflection_probe.cpp b/scene/3d/reflection_probe.cpp index be655e71dbb5..63b34e06bc9d 100644 --- a/scene/3d/reflection_probe.cpp +++ b/scene/3d/reflection_probe.cpp @@ -30,6 +30,13 @@ #include "reflection_probe.h" +#include "core/math/face3.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "servers/rendering_server.h" + void ReflectionProbe::set_intensity(float p_intensity) { intensity = p_intensity; RS::get_singleton()->reflection_probe_set_intensity(probe, p_intensity); diff --git a/scene/3d/reflection_probe.h b/scene/3d/reflection_probe.h index d0643496a475..0501f748d479 100644 --- a/scene/3d/reflection_probe.h +++ b/scene/3d/reflection_probe.h @@ -31,8 +31,19 @@ #ifndef REFLECTIONPROBE_H #define REFLECTIONPROBE_H +#include + +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" #include "scene/3d/visual_instance_3d.h" +struct Face3; + class ReflectionProbe : public VisualInstance3D { GDCLASS(ReflectionProbe, VisualInstance3D); diff --git a/scene/3d/remote_transform_3d.cpp b/scene/3d/remote_transform_3d.cpp index 2770b6f40c3e..7de45412ef1c 100644 --- a/scene/3d/remote_transform_3d.cpp +++ b/scene/3d/remote_transform_3d.cpp @@ -30,6 +30,13 @@ #include "remote_transform_3d.h" +#include "core/math/basis.h" +#include "core/math/transform_3d.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/node.h" + void RemoteTransform3D::_update_cache() { cache = ObjectID(); if (has_node(remote_node)) { diff --git a/scene/3d/remote_transform_3d.h b/scene/3d/remote_transform_3d.h index 03bb253578d6..0ae7110ceaa2 100644 --- a/scene/3d/remote_transform_3d.h +++ b/scene/3d/remote_transform_3d.h @@ -31,8 +31,14 @@ #ifndef REMOTETRANSFORM_H #define REMOTETRANSFORM_H +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/variant/typed_array.h" #include "scene/3d/node_3d.h" +class String; + class RemoteTransform3D : public Node3D { GDCLASS(RemoteTransform3D, Node3D); diff --git a/scene/3d/skeleton_3d.cpp b/scene/3d/skeleton_3d.cpp index b6b5920f6958..bcf5d66e31ba 100644 --- a/scene/3d/skeleton_3d.cpp +++ b/scene/3d/skeleton_3d.cpp @@ -30,13 +30,21 @@ #include "skeleton_3d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" -#include "core/variant/type_info.h" -#include "editor/plugins/skeleton_3d_editor_plugin.h" +#include "core/templates/local_vector.h" +#include "core/variant/array.h" +#include "core/variant/callable.h" +#include "scene/3d/collision_object_3d.h" #include "scene/3d/physics_body_3d.h" -#include "scene/resources/skeleton_modification_3d.h" -#include "scene/resources/surface_tool.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_3d.h" +#include "scene/resources/skin.h" #include "scene/scene_string_names.h" +#include "servers/physics_server_3d.h" +#include "servers/rendering_server.h" void SkinReference::_skin_changed() { if (skeleton_node) { diff --git a/scene/3d/skeleton_3d.h b/scene/3d/skeleton_3d.h index 80ff2a1f79e7..ee27f986630a 100644 --- a/scene/3d/skeleton_3d.h +++ b/scene/3d/skeleton_3d.h @@ -31,10 +31,30 @@ #ifndef SKELETON_3D_H #define SKELETON_3D_H +#include + +#include "core/math/basis.h" +#include "core/math/math_defs.h" +#include "core/math/quaternion.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/3d/node_3d.h" #include "scene/resources/skeleton_modification_3d.h" #include "scene/resources/skin.h" +class Skin; + typedef int BoneId; class PhysicalBone3D; diff --git a/scene/3d/skeleton_ik_3d.cpp b/scene/3d/skeleton_ik_3d.cpp index c645009c72c8..d4e4c305f78d 100644 --- a/scene/3d/skeleton_ik_3d.cpp +++ b/scene/3d/skeleton_ik_3d.cpp @@ -30,6 +30,15 @@ #include "skeleton_ik_3d.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/3d/node_3d.h" + #ifndef _3D_DISABLED FabrikInverseKinematic::ChainItem *FabrikInverseKinematic::ChainItem::find_child(const BoneId p_bone_id) { diff --git a/scene/3d/skeleton_ik_3d.h b/scene/3d/skeleton_ik_3d.h index 3ced5c49d35f..09f29233e3f7 100644 --- a/scene/3d/skeleton_ik_3d.h +++ b/scene/3d/skeleton_ik_3d.h @@ -31,6 +31,17 @@ #ifndef SKELETON_IK_H #define SKELETON_IK_H +#include "core/math/math_defs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "scene/main/node.h" + +class Node3D; #ifndef _3D_DISABLED #include "scene/3d/skeleton_3d.h" diff --git a/scene/3d/soft_dynamic_body_3d.cpp b/scene/3d/soft_dynamic_body_3d.cpp index 8ee777bcbf7e..9dcd2034fe61 100644 --- a/scene/3d/soft_dynamic_body_3d.cpp +++ b/scene/3d/soft_dynamic_body_3d.cpp @@ -30,7 +30,27 @@ #include "soft_dynamic_body_3d.h" +#include + +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/transform_3d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/object/object_id.h" +#include "core/typedefs.h" +#include "core/variant/dictionary.h" +#include "scene/3d/collision_object_3d.h" +#include "scene/3d/node_3d.h" #include "scene/3d/physics_body_3d.h" +#include "scene/main/node.h" +#include "scene/resources/material.h" +#include "scene/resources/mesh.h" +#include "scene/resources/world_3d.h" +#include "servers/rendering_server.h" + +struct AABB; SoftDynamicBodyRenderingServerHandler::SoftDynamicBodyRenderingServerHandler() {} diff --git a/scene/3d/soft_dynamic_body_3d.h b/scene/3d/soft_dynamic_body_3d.h index c30ec701c721..538ce9baaf16 100644 --- a/scene/3d/soft_dynamic_body_3d.h +++ b/scene/3d/soft_dynamic_body_3d.h @@ -31,10 +31,30 @@ #ifndef SOFT_DYNAMIC_BODY_H #define SOFT_DYNAMIC_BODY_H +#include + +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/3d/mesh_instance_3d.h" #include "servers/physics_server_3d.h" class SoftDynamicBody3D; +class ArrayMesh; +class Node3D; +class Node; +struct AABB; class SoftDynamicBodyRenderingServerHandler : public RenderingServerHandler { friend class SoftDynamicBody3D; diff --git a/scene/3d/spring_arm_3d.cpp b/scene/3d/spring_arm_3d.cpp index e0cd44e05b0f..5c87fc19f21d 100644 --- a/scene/3d/spring_arm_3d.cpp +++ b/scene/3d/spring_arm_3d.cpp @@ -29,7 +29,18 @@ /*************************************************************************/ #include "spring_arm_3d.h" + +#include "core/config/engine.h" +#include "core/math/basis.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" #include "scene/3d/camera_3d.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/resources/world_3d.h" +#include "servers/physics_server_3d.h" void SpringArm3D::_notification(int p_what) { switch (p_what) { diff --git a/scene/3d/spring_arm_3d.h b/scene/3d/spring_arm_3d.h index b247ea1707f1..237c854d4a72 100644 --- a/scene/3d/spring_arm_3d.h +++ b/scene/3d/spring_arm_3d.h @@ -31,7 +31,15 @@ #ifndef SPRING_ARM_H #define SPRING_ARM_H +#include + +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/rid.h" +#include "core/templates/set.h" #include "scene/3d/node_3d.h" +#include "scene/resources/shape_3d.h" class SpringArm3D : public Node3D { GDCLASS(SpringArm3D, Node3D); diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 331d58927bbd..bd6fc3fd289e 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -30,7 +30,19 @@ #include "sprite_3d.h" +#include + #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/math/face3.h" +#include "core/math/plane.h" +#include "core/math/triangle_mesh.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/variant/array.h" +#include "core/variant/callable.h" +#include "scene/main/node.h" #include "scene/scene_string_names.h" Color SpriteBase3D::_get_color_accum() { diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h index 985103e1906d..ebcc752e76f5 100644 --- a/scene/3d/sprite_3d.h +++ b/scene/3d/sprite_3d.h @@ -31,8 +31,34 @@ #ifndef SPRITE_3D_H #define SPRITE_3D_H +#include + +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/3d/visual_instance_3d.h" +#include "scene/resources/material.h" #include "scene/resources/sprite_frames.h" +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" + +class String; +class TriangleMesh; +struct Face3; class SpriteBase3D : public GeometryInstance3D { GDCLASS(SpriteBase3D, GeometryInstance3D); diff --git a/scene/3d/vehicle_body_3d.cpp b/scene/3d/vehicle_body_3d.cpp index a5fd3a7dd081..023d82a43da0 100644 --- a/scene/3d/vehicle_body_3d.cpp +++ b/scene/3d/vehicle_body_3d.cpp @@ -30,6 +30,15 @@ #include "vehicle_body_3d.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/node.h" +#include "servers/physics_server_3d.h" + #define ROLLING_INFLUENCE_FIX class btVehicleJacobianEntry { diff --git a/scene/3d/vehicle_body_3d.h b/scene/3d/vehicle_body_3d.h index d2371d819b1c..4f34fdd36c19 100644 --- a/scene/3d/vehicle_body_3d.h +++ b/scene/3d/vehicle_body_3d.h @@ -31,9 +31,20 @@ #ifndef VEHICLE_BODY_H #define VEHICLE_BODY_H +#include "core/math/math_defs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/templates/rid.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/variant/typed_array.h" +#include "scene/3d/node_3d.h" #include "scene/3d/physics_body_3d.h" class VehicleBody3D; +class PhysicsDirectBodyState3D; +class String; class VehicleWheel3D : public Node3D { GDCLASS(VehicleWheel3D, Node3D); diff --git a/scene/3d/velocity_tracker_3d.cpp b/scene/3d/velocity_tracker_3d.cpp index 5bfe519440cf..2808f6491cbc 100644 --- a/scene/3d/velocity_tracker_3d.cpp +++ b/scene/3d/velocity_tracker_3d.cpp @@ -30,6 +30,11 @@ #include "velocity_tracker_3d.h" +#include "core/config/engine.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" + void VelocityTracker3D::set_track_physics_step(bool p_track_physics_step) { physics_step = p_track_physics_step; } diff --git a/scene/3d/velocity_tracker_3d.h b/scene/3d/velocity_tracker_3d.h index 7fdcacc9c16b..2ee67b2f1846 100644 --- a/scene/3d/velocity_tracker_3d.h +++ b/scene/3d/velocity_tracker_3d.h @@ -31,6 +31,12 @@ #ifndef SPATIAL_VELOCITY_TRACKER_H #define SPATIAL_VELOCITY_TRACKER_H +#include + +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/vector.h" #include "scene/3d/node_3d.h" class VelocityTracker3D : public RefCounted { diff --git a/scene/3d/visible_on_screen_notifier_3d.cpp b/scene/3d/visible_on_screen_notifier_3d.cpp index 44d2a3e03f87..8fb956c2e1da 100644 --- a/scene/3d/visible_on_screen_notifier_3d.cpp +++ b/scene/3d/visible_on_screen_notifier_3d.cpp @@ -30,7 +30,15 @@ #include "visible_on_screen_notifier_3d.h" +#include "core/config/engine.h" +#include "core/math/face3.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/templates/rid.h" +#include "core/variant/variant.h" +#include "scene/main/node.h" #include "scene/scene_string_names.h" +#include "servers/rendering_server.h" void VisibleOnScreenNotifier3D::_visibility_enter() { if (!is_inside_tree() || Engine::get_singleton()->is_editor_hint()) { diff --git a/scene/3d/visible_on_screen_notifier_3d.h b/scene/3d/visible_on_screen_notifier_3d.h index 852c7e2ed3f9..b8442bee243c 100644 --- a/scene/3d/visible_on_screen_notifier_3d.h +++ b/scene/3d/visible_on_screen_notifier_3d.h @@ -31,10 +31,21 @@ #ifndef VISIBLE_ON_SCREEN_NOTIFIER_3D_H #define VISIBLE_ON_SCREEN_NOTIFIER_3D_H +#include + +#include "core/math/aabb.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" #include "scene/3d/visual_instance_3d.h" class World3D; class Camera3D; +struct Face3; + class VisibleOnScreenNotifier3D : public VisualInstance3D { GDCLASS(VisibleOnScreenNotifier3D, VisualInstance3D); diff --git a/scene/3d/visual_instance_3d.cpp b/scene/3d/visual_instance_3d.cpp index 005bb5a73795..3be8fa9b36b5 100644 --- a/scene/3d/visual_instance_3d.cpp +++ b/scene/3d/visual_instance_3d.cpp @@ -30,6 +30,13 @@ #include "visual_instance_3d.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_3d.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "scene/main/node.h" +#include "scene/resources/world_3d.h" #include "scene/scene_string_names.h" AABB VisualInstance3D::get_transformed_aabb() const { diff --git a/scene/3d/visual_instance_3d.h b/scene/3d/visual_instance_3d.h index be964e5080e5..b027d2dac796 100644 --- a/scene/3d/visual_instance_3d.h +++ b/scene/3d/visual_instance_3d.h @@ -31,7 +31,25 @@ #ifndef VISUAL_INSTANCE_H #define VISUAL_INSTANCE_H +#include + +#include "core/math/aabb.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/3d/node_3d.h" +#include "scene/resources/material.h" +#include "servers/rendering_server.h" + +struct Face3; class VisualInstance3D : public Node3D { GDCLASS(VisualInstance3D, Node3D); diff --git a/scene/3d/voxel_gi.cpp b/scene/3d/voxel_gi.cpp index bfe3c80a4fde..7f02d8b639fe 100644 --- a/scene/3d/voxel_gi.cpp +++ b/scene/3d/voxel_gi.cpp @@ -30,8 +30,23 @@ #include "voxel_gi.h" +#include "core/error/error_list.h" +#include "core/error/error_macros.h" +#include "core/io/image.h" +#include "core/math/face3.h" +#include "core/object/class_db.h" +#include "core/object/method_bind.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" #include "mesh_instance_3d.h" #include "multimesh_instance_3d.h" +#include "scene/3d/node_3d.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "servers/rendering_server.h" #include "voxelizer.h" void VoxelGIData::_set_data(const Dictionary &p_data) { diff --git a/scene/3d/voxel_gi.h b/scene/3d/voxel_gi.h index 3678bd4f3be0..ff2270d6ba7d 100644 --- a/scene/3d/voxel_gi.h +++ b/scene/3d/voxel_gi.h @@ -31,7 +31,28 @@ #ifndef VOXEL_GI_H #define VOXEL_GI_H +#include + +#include "core/io/resource.h" +#include "core/math/aabb.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/math/vector3i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/typed_array.h" #include "scene/3d/visual_instance_3d.h" +#include "scene/resources/material.h" +#include "scene/resources/mesh.h" + +class Node; +class String; +struct Face3; class VoxelGIData : public Resource { GDCLASS(VoxelGIData, Resource); diff --git a/scene/3d/voxelizer.cpp b/scene/3d/voxelizer.cpp index f56e3caa4bd4..c4e24bd8d6e8 100644 --- a/scene/3d/voxelizer.cpp +++ b/scene/3d/voxelizer.cpp @@ -30,6 +30,23 @@ #include "voxelizer.h" +#include "core/error/error_macros.h" +#include "core/io/image.h" +#include "core/math/basis.h" +#include "core/math/face3.h" +#include "core/math/geometry_3d.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/plane.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/os/memory.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" +#include "scene/resources/mesh.h" +#include "scene/resources/multimesh.h" +#include "scene/resources/texture.h" + static _FORCE_INLINE_ void get_uv_and_normal(const Vector3 &p_pos, const Vector3 *p_vtx, const Vector2 *p_uv, const Vector3 *p_normal, Vector2 &r_uv, Vector3 &r_normal) { if (p_pos.is_equal_approx(p_vtx[0])) { r_uv = p_uv[0]; diff --git a/scene/3d/voxelizer.h b/scene/3d/voxelizer.h index dc7569d17cec..9728de304a99 100644 --- a/scene/3d/voxelizer.h +++ b/scene/3d/voxelizer.h @@ -31,8 +31,25 @@ #ifndef VOXEL_LIGHT_BAKER_H #define VOXEL_LIGHT_BAKER_H +#include + +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3i.h" +#include "core/object/ref_counted.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "scene/resources/material.h" #include "scene/resources/multimesh.h" +class Image; +class Mesh; +class MultiMesh; +struct Vector2; +struct Vector3; + class Voxelizer { private: enum { diff --git a/scene/3d/world_environment.cpp b/scene/3d/world_environment.cpp index 98f28a8cff0b..020d419dec44 100644 --- a/scene/3d/world_environment.cpp +++ b/scene/3d/world_environment.cpp @@ -30,8 +30,14 @@ #include "world_environment.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/variant/variant.h" #include "scene/3d/node_3d.h" -#include "scene/main/window.h" +#include "scene/main/scene_tree.h" +#include "scene/main/viewport.h" +#include "scene/resources/world_3d.h" void WorldEnvironment::_notification(int p_what) { if (p_what == Node3D::NOTIFICATION_ENTER_WORLD || p_what == Node3D::NOTIFICATION_ENTER_TREE) { diff --git a/scene/3d/world_environment.h b/scene/3d/world_environment.h index 8dbb57364ce1..9b27be1288d5 100644 --- a/scene/3d/world_environment.h +++ b/scene/3d/world_environment.h @@ -31,10 +31,15 @@ #ifndef SCENARIO_FX_H #define SCENARIO_FX_H +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/variant/typed_array.h" #include "scene/main/node.h" #include "scene/resources/camera_effects.h" #include "scene/resources/environment.h" +class String; + class WorldEnvironment : public Node { GDCLASS(WorldEnvironment, Node); diff --git a/scene/3d/xr_nodes.cpp b/scene/3d/xr_nodes.cpp index 66d1b9705608..da954b527012 100644 --- a/scene/3d/xr_nodes.cpp +++ b/scene/3d/xr_nodes.cpp @@ -30,8 +30,20 @@ #include "xr_nodes.h" +#include "core/config/project_settings.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/camera_matrix.h" +#include "core/math/rect2.h" +#include "core/math/transform_3d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/main/node.h" #include "scene/main/viewport.h" #include "servers/xr/xr_interface.h" +#include "servers/xr/xr_pose.h" +#include "servers/xr_server.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/scene/3d/xr_nodes.h b/scene/3d/xr_nodes.h index 5675cbd94433..1371f1c0281d 100644 --- a/scene/3d/xr_nodes.h +++ b/scene/3d/xr_nodes.h @@ -31,9 +31,22 @@ #ifndef XR_NODES_H #define XR_NODES_H +#include "core/math/math_defs.h" +#include "core/math/plane.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/vector.h" +#include "core/variant/typed_array.h" #include "scene/3d/camera_3d.h" +#include "scene/3d/node_3d.h" #include "servers/xr/xr_positional_tracker.h" +class XRPose; + /* XRCamera is a subclass of camera which will register itself with its parent XROrigin and as a result is automatically positioned */ diff --git a/scene/animation/animation_blend_space_1d.cpp b/scene/animation/animation_blend_space_1d.cpp index 849316c56838..d05e3ba7faf6 100644 --- a/scene/animation/animation_blend_space_1d.cpp +++ b/scene/animation/animation_blend_space_1d.cpp @@ -30,6 +30,11 @@ #include "animation_blend_space_1d.h" +#include "core/error/error_macros.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" + void AnimationNodeBlendSpace1D::get_parameter_list(List *r_list) const { r_list->push_back(PropertyInfo(Variant::FLOAT, blend_position)); } diff --git a/scene/animation/animation_blend_space_1d.h b/scene/animation/animation_blend_space_1d.h index 7038cece0650..d27b22e7d33d 100644 --- a/scene/animation/animation_blend_space_1d.h +++ b/scene/animation/animation_blend_space_1d.h @@ -31,6 +31,12 @@ #ifndef ANIMATION_BLEND_SPACE_1D_H #define ANIMATION_BLEND_SPACE_1D_H +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/variant/variant.h" #include "scene/animation/animation_tree.h" class AnimationNodeBlendSpace1D : public AnimationRootNode { diff --git a/scene/animation/animation_blend_space_2d.cpp b/scene/animation/animation_blend_space_2d.cpp index a3aa3f6cc8d5..22ee9b2a085d 100644 --- a/scene/animation/animation_blend_space_2d.cpp +++ b/scene/animation/animation_blend_space_2d.cpp @@ -31,7 +31,12 @@ #include "animation_blend_space_2d.h" #include "animation_blend_tree.h" +#include "core/error/error_macros.h" +#include "core/math/delaunay_2d.h" #include "core/math/geometry_2d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/templates/sort_array.h" void AnimationNodeBlendSpace2D::get_parameter_list(List *r_list) const { r_list->push_back(PropertyInfo(Variant::VECTOR2, blend_position)); diff --git a/scene/animation/animation_blend_space_2d.h b/scene/animation/animation_blend_space_2d.h index 1356656bf88b..31d8e1ea431a 100644 --- a/scene/animation/animation_blend_space_2d.h +++ b/scene/animation/animation_blend_space_2d.h @@ -31,6 +31,15 @@ #ifndef ANIMATION_BLEND_SPACE_2D_H #define ANIMATION_BLEND_SPACE_2D_H +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/animation/animation_tree.h" class AnimationNodeBlendSpace2D : public AnimationRootNode { diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp index 3d0ac291b8a5..c74c605bf4b0 100644 --- a/scene/animation/animation_blend_tree.cpp +++ b/scene/animation/animation_blend_tree.cpp @@ -30,6 +30,17 @@ #include "animation_blend_tree.h" +#include +#include + +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/templates/pair.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "scene/animation/animation_player.h" #include "scene/resources/animation.h" #include "scene/scene_string_names.h" diff --git a/scene/animation/animation_blend_tree.h b/scene/animation/animation_blend_tree.h index 2acacd7396db..9212dd2944f3 100644 --- a/scene/animation/animation_blend_tree.h +++ b/scene/animation/animation_blend_tree.h @@ -31,6 +31,18 @@ #ifndef ANIMATION_BLEND_TREE_H #define ANIMATION_BLEND_TREE_H +#include + +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/animation/animation_tree.h" class AnimationNodeAnimation : public AnimationRootNode { diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp index a68f7e037d1a..eab427b5ebeb 100644 --- a/scene/animation/animation_node_state_machine.cpp +++ b/scene/animation/animation_node_state_machine.cpp @@ -30,6 +30,13 @@ #include "animation_node_state_machine.h" +#include "core/error/error_macros.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/templates/pair.h" +#include "core/typedefs.h" +#include "core/variant/array.h" + ///////////////////////////////////////////////// void AnimationNodeStateMachineTransition::set_switch_mode(SwitchMode p_mode) { diff --git a/scene/animation/animation_node_state_machine.h b/scene/animation/animation_node_state_machine.h index b980556875b6..ec55a85d839d 100644 --- a/scene/animation/animation_node_state_machine.h +++ b/scene/animation/animation_node_state_machine.h @@ -31,6 +31,17 @@ #ifndef ANIMATION_NODE_STATE_MACHINE_H #define ANIMATION_NODE_STATE_MACHINE_H +#include "core/io/resource.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/animation/animation_tree.h" class AnimationNodeStateMachineTransition : public Resource { diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 4a3fd7208080..61d977e86214 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -30,8 +30,25 @@ #include "animation_player.h" +#include +#include + #include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_3d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" +#include "core/object/undo_redo.h" +#include "core/os/memory.h" +#include "core/templates/pair.h" +#include "core/variant/array.h" +#include "scene/2d/node_2d.h" +#include "scene/3d/mesh_instance_3d.h" +#include "scene/3d/node_3d.h" +#include "scene/3d/skeleton_3d.h" #include "scene/scene_string_names.h" #include "servers/audio/audio_stream.h" diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h index c4fc69f370db..55316989fda2 100644 --- a/scene/animation/animation_player.h +++ b/scene/animation/animation_player.h @@ -31,12 +31,37 @@ #ifndef ANIMATION_PLAYER_H #define ANIMATION_PLAYER_H +#include + +#include "core/error/error_list.h" +#include "core/io/resource.h" +#include "core/math/quaternion.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/2d/node_2d.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/node_3d.h" #include "scene/3d/skeleton_3d.h" +#include "scene/main/node.h" #include "scene/resources/animation.h" +class MeshInstance3D; +class Node2D; +class Node3D; +class Skeleton3D; + #ifdef TOOLS_ENABLED class AnimatedValuesBackup : public RefCounted { GDCLASS(AnimatedValuesBackup, RefCounted); diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index f2f69fc43957..2dcf37bd425b 100644 --- a/scene/animation/animation_tree.cpp +++ b/scene/animation/animation_tree.cpp @@ -30,8 +30,22 @@ #include "animation_tree.h" +#include + #include "animation_blend_tree.h" #include "core/config/engine.h" +#include "core/error/error_list.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/typedefs.h" +#include "scene/3d/mesh_instance_3d.h" +#include "scene/3d/node_3d.h" +#include "scene/3d/skeleton_3d.h" +#include "scene/animation/animation_player.h" #include "scene/resources/animation.h" #include "scene/scene_string_names.h" #include "servers/audio/audio_stream.h" diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h index 705ee91c7629..b54250b8c4d0 100644 --- a/scene/animation/animation_tree.h +++ b/scene/animation/animation_tree.h @@ -31,14 +31,41 @@ #ifndef ANIMATION_GRAPH_PLAYER_H #define ANIMATION_GRAPH_PLAYER_H +#include + #include "animation_player.h" +#include "core/io/resource.h" +#include "core/math/math_defs.h" +#include "core/math/quaternion.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/list.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/3d/node_3d.h" #include "scene/3d/skeleton_3d.h" +#include "scene/main/node.h" #include "scene/resources/animation.h" class AnimationNodeBlendTree; class AnimationPlayer; class AnimationTree; +class MeshInstance3D; +class Node3D; +class Skeleton3D; class AnimationNode : public Resource { GDCLASS(AnimationNode, Resource); diff --git a/scene/animation/root_motion_view.cpp b/scene/animation/root_motion_view.cpp index 0d4468758892..76bc6ae48b58 100644 --- a/scene/animation/root_motion_view.cpp +++ b/scene/animation/root_motion_view.cpp @@ -29,8 +29,21 @@ /*************************************************************************/ #include "root_motion_view.h" + +#include "core/config/engine.h" +#include "core/math/face3.h" +#include "core/math/math_funcs.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "scene/animation/animation_tree.h" +#include "scene/main/node.h" +#include "scene/resources/immediate_mesh.h" #include "scene/resources/material.h" +#include "scene/resources/mesh.h" + void RootMotionView::set_animation_path(const NodePath &p_path) { path = p_path; first = true; diff --git a/scene/animation/root_motion_view.h b/scene/animation/root_motion_view.h index e8b141c1fdf2..f643cae89a3b 100644 --- a/scene/animation/root_motion_view.h +++ b/scene/animation/root_motion_view.h @@ -31,8 +31,23 @@ #ifndef ROOT_MOTION_VIEW_H #define ROOT_MOTION_VIEW_H +#include + +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/transform_3d.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/templates/vector.h" #include "scene/3d/visual_instance_3d.h" #include "scene/resources/immediate_mesh.h" + +class ImmediateMesh; +class Material; +struct Face3; + class RootMotionView : public VisualInstance3D { GDCLASS(RootMotionView, VisualInstance3D); diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index a2fed718bee1..429055580123 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -30,6 +30,24 @@ #include "tween.h" +#include "core/error/error_macros.h" +#include "core/math/aabb.h" +#include "core/math/basis.h" +#include "core/math/color.h" +#include "core/math/math_funcs.h" +#include "core/math/quaternion.h" +#include "core/math/rect2.h" +#include "core/math/rect2i.h" +#include "core/math/transform_2d.h" +#include "core/math/transform_3d.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/math/vector3.h" +#include "core/math/vector3i.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" #include "scene/animation/easing_equations.h" #include "scene/main/node.h" diff --git a/scene/animation/tween.h b/scene/animation/tween.h index 5b0745b2b3a7..06ec3507e99c 100644 --- a/scene/animation/tween.h +++ b/scene/animation/tween.h @@ -31,7 +31,17 @@ #ifndef TWEEN_H #define TWEEN_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/object_id.h" #include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/callable.h" +#include "core/variant/variant.h" class Tween; class Node; diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp index 5f9d8a0d47fe..1460d644825c 100644 --- a/scene/audio/audio_stream_player.cpp +++ b/scene/audio/audio_stream_player.cpp @@ -31,7 +31,14 @@ #include "audio_stream_player.h" #include "core/config/engine.h" +#include "core/error/error_macros.h" #include "core/math/audio_frame.h" +#include "core/math/math_funcs.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "servers/audio/audio_stream.h" #include "servers/audio_server.h" void AudioStreamPlayer::_notification(int p_what) { diff --git a/scene/audio/audio_stream_player.h b/scene/audio/audio_stream_player.h index 67e616312a51..cf72a9326966 100644 --- a/scene/audio/audio_stream_player.h +++ b/scene/audio/audio_stream_player.h @@ -31,10 +31,19 @@ #ifndef AUDIO_STREAM_PLAYER_H #define AUDIO_STREAM_PLAYER_H +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" #include "core/templates/safe_refcount.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" #include "scene/main/node.h" #include "servers/audio/audio_stream.h" +class AudioStream; +class AudioStreamPlayback; +struct AudioFrame; + class AudioStreamPlayer : public Node { GDCLASS(AudioStreamPlayer, Node); diff --git a/scene/debugger/scene_debugger.cpp b/scene/debugger/scene_debugger.cpp index 41340f281bfa..10f4925be9ee 100644 --- a/scene/debugger/scene_debugger.cpp +++ b/scene/debugger/scene_debugger.cpp @@ -30,9 +30,24 @@ #include "scene_debugger.h" +#include + #include "core/debugger/engine_debugger.h" +#include "core/error/error_macros.h" #include "core/io/marshalls.h" +#include "core/io/resource.h" +#include "core/io/resource_loader.h" +#include "core/io/resource_saver.h" +#include "core/math/transform_2d.h" +#include "core/math/transform_3d.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" #include "core/object/script_language.h" +#include "core/os/memory.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "scene/main/node.h" #include "scene/main/scene_tree.h" #include "scene/main/window.h" #include "scene/resources/packed_scene.h" diff --git a/scene/debugger/scene_debugger.h b/scene/debugger/scene_debugger.h index c8298391bb51..341783b4eadf 100644 --- a/scene/debugger/scene_debugger.h +++ b/scene/debugger/scene_debugger.h @@ -31,13 +31,24 @@ #ifndef SCENE_DEBUGGER_H #define SCENE_DEBUGGER_H +#include "core/error/error_list.h" #include "core/object/class_db.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" #include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" #include "core/templates/pair.h" +#include "core/templates/set.h" #include "core/variant/array.h" +#include "core/variant/variant.h" class Script; class Node; +class Array; +class ScriptInstance; class SceneDebugger { public: diff --git a/scene/gui/aspect_ratio_container.cpp b/scene/gui/aspect_ratio_container.cpp index 181d1bf33b89..5f2d480c998b 100644 --- a/scene/gui/aspect_ratio_container.cpp +++ b/scene/gui/aspect_ratio_container.cpp @@ -30,6 +30,13 @@ #include "aspect_ratio_container.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" +#include "scene/main/node.h" + Size2 AspectRatioContainer::get_minimum_size() const { Size2 ms; for (int i = 0; i < get_child_count(); i++) { diff --git a/scene/gui/aspect_ratio_container.h b/scene/gui/aspect_ratio_container.h index 4a168bad146f..4553c30dc57f 100644 --- a/scene/gui/aspect_ratio_container.h +++ b/scene/gui/aspect_ratio_container.h @@ -31,6 +31,9 @@ #ifndef ASPECT_RATIO_CONTAINER_H #define ASPECT_RATIO_CONTAINER_H +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/variant/binder_common.h" #include "scene/gui/container.h" class AspectRatioContainer : public Container { diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index da2ef6c5ec2a..c7202d16cf04 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -30,9 +30,14 @@ #include "base_button.h" -#include "core/os/keyboard.h" -#include "scene/main/window.h" -#include "scene/scene_string_names.h" +#include "core/error/error_macros.h" +#include "core/input/input_event.h" +#include "core/input/shortcut.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/viewport.h" void BaseButton::_unpress_group() { if (!button_group.is_valid()) { diff --git a/scene/gui/base_button.h b/scene/gui/base_button.h index 0bcad4fc0ef2..9a827796fbfa 100644 --- a/scene/gui/base_button.h +++ b/scene/gui/base_button.h @@ -31,9 +31,25 @@ #ifndef BASE_BUTTON_H #define BASE_BUTTON_H +#include "core/input/input_enums.h" +#include "core/io/resource.h" +#include "core/math/vector2.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/set.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" #include "scene/gui/control.h" class ButtonGroup; +class InputEvent; +class Node; +class Shortcut; class BaseButton : public Control { GDCLASS(BaseButton, Control); diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp index 9827bd0cefaa..4597a5315904 100644 --- a/scene/gui/box_container.cpp +++ b/scene/gui/box_container.cpp @@ -29,8 +29,20 @@ /*************************************************************************/ #include "box_container.h" + +#include "core/error/error_macros.h" +#include "core/math/rect2.h" +#include "core/math/vector2i.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/templates/map.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "label.h" #include "margin_container.h" +#include "scene/gui/control.h" +#include "scene/main/node.h" struct _MinSizeCache { int min_size = 0; diff --git a/scene/gui/box_container.h b/scene/gui/box_container.h index 68d55e1aafb3..804cfb43f3a5 100644 --- a/scene/gui/box_container.h +++ b/scene/gui/box_container.h @@ -31,8 +31,14 @@ #ifndef BOX_CONTAINER_H #define BOX_CONTAINER_H +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/string/ustring.h" +#include "core/variant/binder_common.h" #include "scene/gui/container.h" +class Control; + class BoxContainer : public Container { GDCLASS(BoxContainer, Container); @@ -74,6 +80,7 @@ class HBoxContainer : public BoxContainer { }; class MarginContainer; + class VBoxContainer : public BoxContainer { GDCLASS(VBoxContainer, BoxContainer); diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index 3ed1b873afe3..10f4d3d183d2 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -30,8 +30,23 @@ #include "button.h" +#include + +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" #include "core/string/translation.h" -#include "servers/rendering_server.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/font.h" +#include "scene/resources/style_box.h" +#include "scene/resources/text_paragraph.h" +#include "scene/resources/texture.h" +#include "servers/text_server.h" Size2 Button::get_minimum_size() const { Size2 minsize = text_buf->get_size(); diff --git a/scene/gui/button.h b/scene/gui/button.h index 1abf86c986e8..f20dce536818 100644 --- a/scene/gui/button.h +++ b/scene/gui/button.h @@ -31,9 +31,22 @@ #ifndef BUTTON_H #define BUTTON_H +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/gui/base_button.h" +#include "scene/gui/control.h" #include "scene/resources/text_paragraph.h" +class TextParagraph; +class Texture2D; + class Button : public BaseButton { GDCLASS(Button, BaseButton); diff --git a/scene/gui/center_container.cpp b/scene/gui/center_container.cpp index f3306783f332..882cebe45f6b 100644 --- a/scene/gui/center_container.cpp +++ b/scene/gui/center_container.cpp @@ -30,6 +30,13 @@ #include "center_container.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" +#include "scene/main/node.h" + Size2 CenterContainer::get_minimum_size() const { if (use_top_left) { return Size2(); diff --git a/scene/gui/center_container.h b/scene/gui/center_container.h index 16a10c8070b3..b48b58d3f3a6 100644 --- a/scene/gui/center_container.h +++ b/scene/gui/center_container.h @@ -31,6 +31,8 @@ #ifndef CENTER_CONTAINER_H #define CENTER_CONTAINER_H +#include "core/math/vector2.h" +#include "core/object/object.h" #include "scene/gui/container.h" class CenterContainer : public Container { diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp index da2d4369d122..f1230e6286f8 100644 --- a/scene/gui/check_box.cpp +++ b/scene/gui/check_box.cpp @@ -30,7 +30,17 @@ #include "check_box.h" -#include "servers/rendering_server.h" +#include "core/math/math_defs.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" Size2 CheckBox::get_icon_size() const { Ref checked = Control::get_theme_icon(SNAME("checked")); diff --git a/scene/gui/check_box.h b/scene/gui/check_box.h index fcdb2ce08cbf..13849afe428f 100644 --- a/scene/gui/check_box.h +++ b/scene/gui/check_box.h @@ -31,6 +31,9 @@ #ifndef CHECK_BOX_H #define CHECK_BOX_H +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/string/ustring.h" #include "scene/gui/button.h" class CheckBox : public Button { diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp index afb23a540b2d..531a31612882 100644 --- a/scene/gui/check_button.cpp +++ b/scene/gui/check_button.cpp @@ -30,8 +30,17 @@ #include "check_button.h" -#include "core/string/print_string.h" -#include "servers/rendering_server.h" +#include "core/math/math_defs.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "scene/gui/control.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" Size2 CheckButton::get_icon_size() const { Ref on = Control::get_theme_icon(is_disabled() ? "on_disabled" : "on"); diff --git a/scene/gui/check_button.h b/scene/gui/check_button.h index 9a72d04db23a..22fbdb18cfbc 100644 --- a/scene/gui/check_button.h +++ b/scene/gui/check_button.h @@ -31,6 +31,8 @@ #ifndef CHECK_BUTTON_H #define CHECK_BUTTON_H +#include "core/math/vector2.h" +#include "core/object/object.h" #include "scene/gui/button.h" class CheckButton : public Button { diff --git a/scene/gui/code_edit.cpp b/scene/gui/code_edit.cpp index 8cb8a78e8d82..bef9f40889f0 100644 --- a/scene/gui/code_edit.cpp +++ b/scene/gui/code_edit.cpp @@ -30,9 +30,29 @@ #include "code_edit.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/os/keyboard.h" +#include "core/string/char_utils.h" #include "core/string/string_builder.h" #include "core/string/ustring.h" +#include "core/templates/pair.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/font.h" +#include "scene/resources/style_box.h" +#include "scene/resources/text_line.h" +#include "servers/rendering_server.h" +#include "servers/text_server.h" void CodeEdit::_notification(int p_what) { switch (p_what) { diff --git a/scene/gui/code_edit.h b/scene/gui/code_edit.h index cb1309ced30b..6127cefee43f 100644 --- a/scene/gui/code_edit.h +++ b/scene/gui/code_edit.h @@ -31,7 +31,37 @@ #ifndef CODEEDIT_H #define CODEEDIT_H +#include + +#include "core/io/resource.h" +#include "core/math/color.h" +#include "core/math/rect2i.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/object/script_language.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" #include "scene/gui/text_edit.h" +#include "scene/resources/texture.h" + +class Font; +class InputEvent; +class StyleBox; +struct Rect2; class CodeEdit : public TextEdit { GDCLASS(CodeEdit, TextEdit) diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 36ea843d1ea6..22a0e9481f77 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -30,14 +30,39 @@ #include "color_picker.h" -#include "core/input/input.h" -#include "core/os/keyboard.h" -#include "core/os/os.h" - #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" #endif +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/io/image.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/math/rect2i.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/callable.h" +#include "scene/gui/label.h" +#include "scene/gui/popup.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/slider.h" +#include "scene/gui/spin_box.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/main/viewport.h" #include "scene/main/window.h" +#include "scene/resources/shader.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" List ColorPicker::preset_cache; diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h index d6067b1cf4e0..9bffeac061ea 100644 --- a/scene/gui/color_picker.h +++ b/scene/gui/color_picker.h @@ -31,18 +31,38 @@ #ifndef COLOR_PICKER_H #define COLOR_PICKER_H +#include "core/math/color.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/gui/aspect_ratio_container.h" +#include "scene/gui/base_button.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/check_button.h" +#include "scene/gui/control.h" #include "scene/gui/grid_container.h" #include "scene/gui/label.h" #include "scene/gui/line_edit.h" +#include "scene/gui/margin_container.h" #include "scene/gui/popup.h" #include "scene/gui/separator.h" #include "scene/gui/slider.h" #include "scene/gui/spin_box.h" #include "scene/gui/texture_rect.h" +#include "scene/resources/material.h" + +class HSlider; +class InputEvent; +class Label; +class PopupPanel; +class Shader; +class SpinBox; class ColorPresetButton : public BaseButton { GDCLASS(ColorPresetButton, BaseButton); diff --git a/scene/gui/color_rect.cpp b/scene/gui/color_rect.cpp index dbac1fc78ac9..bca34b6f178c 100644 --- a/scene/gui/color_rect.cpp +++ b/scene/gui/color_rect.cpp @@ -30,6 +30,12 @@ #include "color_rect.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" + void ColorRect::set_color(const Color &p_color) { color = p_color; update(); diff --git a/scene/gui/color_rect.h b/scene/gui/color_rect.h index 35c8ebcaf89c..f710d04abeef 100644 --- a/scene/gui/color_rect.h +++ b/scene/gui/color_rect.h @@ -31,6 +31,8 @@ #ifndef COLOR_RECT_H #define COLOR_RECT_H +#include "core/math/color.h" +#include "core/object/object.h" #include "scene/gui/control.h" class ColorRect : public Control { diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index 7b213ec3145c..ce13a85589ab 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -29,7 +29,19 @@ /*************************************************************************/ #include "container.h" + +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" #include "scene/scene_string_names.h" void Container::_child_minsize_changed() { diff --git a/scene/gui/container.h b/scene/gui/container.h index 0e986f46ef77..e204267fd9d9 100644 --- a/scene/gui/container.h +++ b/scene/gui/container.h @@ -31,8 +31,14 @@ #ifndef CONTAINER_H #define CONTAINER_H +#include "core/object/object.h" +#include "core/variant/typed_array.h" #include "scene/gui/control.h" +class Node; +class String; +struct Rect2; + class Container : public Control { GDCLASS(Container, Control); diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index fdae8e2f1fd1..e337971b03c4 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -30,17 +30,25 @@ #include "control.h" +#include +#include + #include "container.h" +#include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/error/error_macros.h" +#include "core/input/input_event.h" #include "core/math/geometry_2d.h" +#include "core/math/math_funcs.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" -#include "core/os/keyboard.h" -#include "core/os/os.h" -#include "core/string/print_string.h" +#include "core/os/main_loop.h" #include "core/string/translation.h" -#include "scene/gui/label.h" -#include "scene/gui/panel.h" -#include "scene/main/canvas_layer.h" +#include "core/templates/vector.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/main/viewport.h" #include "scene/main/window.h" #include "scene/scene_string_names.h" #include "servers/rendering_server.h" diff --git a/scene/gui/control.h b/scene/gui/control.h index 962135280f14..bc81a989ba69 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -32,17 +32,43 @@ #define CONTROL_H #include "core/input/shortcut.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" #include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" #include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/list.h" #include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/main/canvas_item.h" #include "scene/main/node.h" #include "scene/main/timer.h" +#include "scene/resources/font.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" #include "scene/resources/theme.h" +#include "servers/text_server.h" class Viewport; class Label; class Panel; +class InputEvent; +class Node; +class Window; class Control : public CanvasItem { GDCLASS(Control, CanvasItem); diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index 1cbe3adb3c74..e6d5360d0ba1 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -30,13 +30,26 @@ #include "dialogs.h" +#include "core/error/error_macros.h" +#include "core/input/input_event.h" +#include "core/math/math_defs.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/os/keyboard.h" -#include "core/string/print_string.h" -#include "core/string/translation.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "line_edit.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" +#include "scene/gui/control.h" +#include "scene/gui/label.h" +#include "scene/gui/panel.h" +#include "scene/main/node.h" #ifdef TOOLS_ENABLED -#include "editor/editor_node.h" #include "scene/main/window.h" // Only used to check for more modals when dimming the editor. #endif diff --git a/scene/gui/dialogs.h b/scene/gui/dialogs.h index 1365b1df24fa..b1afac799e63 100644 --- a/scene/gui/dialogs.h +++ b/scene/gui/dialogs.h @@ -32,6 +32,10 @@ #define DIALOGS_H #include "box_container.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" #include "scene/gui/button.h" #include "scene/gui/label.h" #include "scene/gui/panel.h" @@ -40,6 +44,12 @@ #include "scene/main/window.h" class LineEdit; +class Button; +class Control; +class HBoxContainer; +class InputEvent; +class Label; +class Panel; class AcceptDialog : public Window { GDCLASS(AcceptDialog, Window); diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index dad84461f4b0..19110231a941 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -30,9 +30,36 @@ #include "file_dialog.h" +#include "core/error/error_list.h" +#include "core/error/error_macros.h" +#include "core/input/input_event.h" +#include "core/io/dir_access.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/os/keyboard.h" -#include "core/string/print_string.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/typedefs.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" +#include "scene/gui/box_container.h" +#include "scene/gui/button.h" +#include "scene/gui/control.h" #include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/option_button.h" +#include "scene/gui/scroll_bar.h" +#include "scene/gui/tree.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/main/window.h" + +class Texture2D; FileDialog::GetIconFunc FileDialog::get_icon_func = nullptr; FileDialog::GetIconFunc FileDialog::get_large_icon_func = nullptr; diff --git a/scene/gui/file_dialog.h b/scene/gui/file_dialog.h index 36a6b262b092..c6753d7acdb2 100644 --- a/scene/gui/file_dialog.h +++ b/scene/gui/file_dialog.h @@ -33,11 +33,27 @@ #include "box_container.h" #include "core/io/dir_access.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" #include "scene/gui/dialogs.h" #include "scene/gui/line_edit.h" #include "scene/gui/option_button.h" #include "scene/gui/tree.h" +class Button; +class DirAccess; +class HBoxContainer; +class InputEvent; +class Label; +class LineEdit; +class OptionButton; +class Texture2D; +class Tree; +class VBoxContainer; + class FileDialog : public ConfirmationDialog { GDCLASS(FileDialog, ConfirmationDialog); diff --git a/scene/gui/flow_container.cpp b/scene/gui/flow_container.cpp index d1ac60b325f6..f246e93cf5a9 100644 --- a/scene/gui/flow_container.cpp +++ b/scene/gui/flow_container.cpp @@ -28,9 +28,17 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "scene/gui/container.h" - #include "flow_container.h" +#include "core/math/rect2.h" +#include "core/math/vector2i.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "scene/gui/container.h" +#include "scene/gui/control.h" +#include "scene/main/node.h" struct _LineData { int child_count = 0; diff --git a/scene/gui/flow_container.h b/scene/gui/flow_container.h index e3ed423ae1f1..4bcc8e82b86d 100644 --- a/scene/gui/flow_container.h +++ b/scene/gui/flow_container.h @@ -31,6 +31,10 @@ #ifndef FLOW_CONTAINER_H #define FLOW_CONTAINER_H +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "scene/gui/container.h" + class Container; class FlowContainer : public Container { diff --git a/scene/gui/gradient_edit.cpp b/scene/gui/gradient_edit.cpp index bec3d58384a0..80b7d83f6667 100644 --- a/scene/gui/gradient_edit.cpp +++ b/scene/gui/gradient_edit.cpp @@ -30,7 +30,22 @@ #include "gradient_edit.h" +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" #include "core/os/keyboard.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/typedefs.h" +#include "scene/gui/color_picker.h" +#include "scene/gui/popup.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/texture.h" GradientEdit::GradientEdit() { set_focus_mode(FOCUS_ALL); diff --git a/scene/gui/gradient_edit.h b/scene/gui/gradient_edit.h index 67531d4f4ad5..5c9359bfe160 100644 --- a/scene/gui/gradient_edit.h +++ b/scene/gui/gradient_edit.h @@ -31,10 +31,22 @@ #ifndef GRADIENT_EDIT_H #define GRADIENT_EDIT_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/vector.h" #include "scene/gui/color_picker.h" +#include "scene/gui/control.h" #include "scene/gui/popup.h" #include "scene/resources/gradient.h" +class ColorPicker; +class GradientTexture1D; +class InputEvent; +class PopupPanel; + class GradientEdit : public Control { GDCLASS(GradientEdit, Control); diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 95575a8226d9..3df6aa56868d 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -30,12 +30,36 @@ #include "graph_edit.h" +#include +#include +#include + +#include "core/error/error_macros.h" #include "core/input/input.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" #include "core/math/math_funcs.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/os/keyboard.h" +#include "core/os/memory.h" +#include "core/string/node_path.h" +#include "core/templates/pair.h" +#include "core/typedefs.h" +#include "core/variant/dictionary.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" +#include "scene/gui/graph_node.h" +#include "scene/gui/label.h" +#include "scene/gui/scroll_bar.h" +#include "scene/gui/spin_box.h" #include "scene/gui/view_panner.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/curve.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" constexpr int MINIMAP_OFFSET = 12; constexpr int MINIMAP_PADDING = 5; diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h index da973b46f0aa..ea621a5f6a75 100644 --- a/scene/gui/graph_edit.h +++ b/scene/gui/graph_edit.h @@ -31,17 +31,52 @@ #ifndef GRAPH_EDIT_H #define GRAPH_EDIT_H +#include + +#include "core/error/error_list.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/list.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" +#include "scene/gui/control.h" #include "scene/gui/graph_node.h" #include "scene/gui/label.h" #include "scene/gui/scroll_bar.h" #include "scene/gui/slider.h" #include "scene/gui/spin_box.h" #include "scene/gui/texture_rect.h" +#include "scene/gui/view_panner.h" class GraphEdit; class ViewPanner; +class Button; +class CanvasItem; +class Dictionary; +class GraphNode; +class HBoxContainer; +class HScrollBar; +class InputEvent; +class Label; +class Node; +class SpinBox; +class VScrollBar; +struct Vector2i; +template +struct Pair; class GraphEditFilter : public Control { GDCLASS(GraphEditFilter, Control); diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp index 30f6cf4a14c2..cfb37ad9e1d8 100644 --- a/scene/gui/graph_node.cpp +++ b/scene/gui/graph_node.cpp @@ -30,7 +30,23 @@ #include "graph_node.h" +#include + +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/math_defs.h" +#include "core/math/vector2i.h" +#include "core/object/class_db.h" #include "core/string/translation.h" +#include "core/templates/pair.h" +#include "core/typedefs.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/style_box.h" +#include "servers/text_server.h" + +class Font; #ifdef TOOLS_ENABLED #include "graph_edit.h" #endif diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h index b41fc7f5d40b..5ad42a4fd161 100644 --- a/scene/gui/graph_node.h +++ b/scene/gui/graph_node.h @@ -31,8 +31,25 @@ #ifndef GRAPH_NODE_H #define GRAPH_NODE_H +#include "core/math/color.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/gui/container.h" +#include "scene/gui/control.h" #include "scene/resources/text_line.h" +#include "scene/resources/texture.h" + +class InputEvent; class GraphNode : public Container { GDCLASS(GraphNode, Container); diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp index 465c9dac78b1..43b1562e61ec 100644 --- a/scene/gui/grid_container.cpp +++ b/scene/gui/grid_container.cpp @@ -30,6 +30,21 @@ #include "grid_container.h" +#include + +#include "core/error/error_macros.h" +#include "core/math/rect2.h" +#include "core/math/vector2i.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/templates/map.h" +#include "core/templates/pair.h" +#include "core/templates/set.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" +#include "scene/main/node.h" + void GridContainer::_notification(int p_what) { switch (p_what) { case NOTIFICATION_SORT_CHILDREN: { diff --git a/scene/gui/grid_container.h b/scene/gui/grid_container.h index 9d77f90ab331..bb53ec4d1984 100644 --- a/scene/gui/grid_container.h +++ b/scene/gui/grid_container.h @@ -31,6 +31,8 @@ #ifndef GRID_CONTAINER_H #define GRID_CONTAINER_H +#include "core/math/vector2.h" +#include "core/object/object.h" #include "scene/gui/container.h" class GridContainer : public Container { diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index 0cb3249c1d48..595192d2a369 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -31,8 +31,24 @@ #include "item_list.h" #include "core/config/project_settings.h" +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/math_funcs.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" #include "core/os/os.h" #include "core/string/translation.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "scene/gui/scroll_bar.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/style_box.h" +#include "servers/rendering_server.h" +#include "servers/text_server.h" void ItemList::_shape(int p_idx) { Item &item = items.write[p_idx]; diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h index 77e910870f8c..4c8700199276 100644 --- a/scene/gui/item_list.h +++ b/scene/gui/item_list.h @@ -31,9 +31,29 @@ #ifndef ITEMLIST_H #define ITEMLIST_H +#include + +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/rect2i.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/gui/control.h" #include "scene/gui/scroll_bar.h" #include "scene/resources/text_paragraph.h" +#include "scene/resources/texture.h" + +class InputEvent; +class VScrollBar; class ItemList : public Control { GDCLASS(ItemList, Control); diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 852aaaab24bd..c7a5f4fbdb7a 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -30,10 +30,20 @@ #include "label.h" -#include "core/config/project_settings.h" -#include "core/string/print_string.h" -#include "core/string/translation.h" +#include +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/string/translation.h" +#include "core/typedefs.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/font.h" +#include "scene/resources/style_box.h" +#include "servers/rendering_server.h" #include "servers/text_server.h" void Label::set_autowrap_mode(Label::AutowrapMode p_mode) { diff --git a/scene/gui/label.h b/scene/gui/label.h index 0b931b3084c4..c58e36ad77ad 100644 --- a/scene/gui/label.h +++ b/scene/gui/label.h @@ -31,6 +31,18 @@ #ifndef LABEL_H #define LABEL_H +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/gui/control.h" class Label : public Control { diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 3aae3377bc30..ef9fee4398fe 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -30,19 +30,42 @@ #include "line_edit.h" +#include + +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/input/input.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" #include "core/input/input_map.h" +#include "core/math/color.h" +#include "core/math/rect2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" #include "core/os/keyboard.h" +#include "core/os/main_loop.h" +#include "core/os/memory.h" #include "core/os/os.h" -#include "core/string/print_string.h" #include "core/string/translation.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" #include "label.h" +#include "scene/gui/popup_menu.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/scene_tree.h" +#include "scene/main/timer.h" +#include "scene/main/viewport.h" +#include "scene/resources/font.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" #include "servers/display_server.h" +#include "servers/rendering_server.h" #include "servers/text_server.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" #endif -#include "scene/main/window.h" void LineEdit::_swap_current_input_direction() { if (input_direction == TEXT_DIRECTION_LTR) { diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h index 1519c09d7362..681a36e95dc0 100644 --- a/scene/gui/line_edit.h +++ b/scene/gui/line_edit.h @@ -31,9 +31,30 @@ #ifndef LINE_EDIT_H #define LINE_EDIT_H +#include + +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/keyboard.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/gui/control.h" #include "scene/gui/popup_menu.h" +class InputEvent; +class PopupMenu; +class Texture2D; +class Timer; + class LineEdit : public Control { GDCLASS(LineEdit, Control); diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp index 0ff05faf855b..01c0189d159a 100644 --- a/scene/gui/link_button.cpp +++ b/scene/gui/link_button.cpp @@ -29,7 +29,21 @@ /*************************************************************************/ #include "link_button.h" + +#include + +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" #include "core/string/translation.h" +#include "core/templates/rid.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/style_box.h" +#include "servers/text_server.h" + +class Font; void LinkButton::_shape() { Ref font = get_theme_font(SNAME("font")); diff --git a/scene/gui/link_button.h b/scene/gui/link_button.h index 7d302e967d7d..3e8ea80d4415 100644 --- a/scene/gui/link_button.h +++ b/scene/gui/link_button.h @@ -31,7 +31,18 @@ #ifndef LINKBUTTON_H #define LINKBUTTON_H +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/gui/base_button.h" +#include "scene/gui/control.h" #include "scene/resources/bit_map.h" #include "scene/resources/text_line.h" diff --git a/scene/gui/margin_container.cpp b/scene/gui/margin_container.cpp index 7b696ddb847c..dee99e4c7839 100644 --- a/scene/gui/margin_container.cpp +++ b/scene/gui/margin_container.cpp @@ -30,6 +30,11 @@ #include "margin_container.h" +#include "core/math/rect2.h" +#include "core/string/string_name.h" +#include "scene/gui/control.h" +#include "scene/main/node.h" + Size2 MarginContainer::get_minimum_size() const { int margin_left = get_theme_constant(SNAME("margin_left")); int margin_top = get_theme_constant(SNAME("margin_top")); diff --git a/scene/gui/margin_container.h b/scene/gui/margin_container.h index 3a2f0fa8b34a..24c12f144681 100644 --- a/scene/gui/margin_container.h +++ b/scene/gui/margin_container.h @@ -31,6 +31,8 @@ #ifndef MARGIN_CONTAINER_H #define MARGIN_CONTAINER_H +#include "core/math/vector2.h" +#include "core/object/object.h" #include "scene/gui/container.h" class MarginContainer : public Container { diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp index a985a9d03135..6352574accb5 100644 --- a/scene/gui/menu_button.cpp +++ b/scene/gui/menu_button.cpp @@ -30,8 +30,25 @@ #include "menu_button.h" -#include "core/os/keyboard.h" +#include "core/error/error_macros.h" +#include "core/input/input.h" +#include "core/input/input_event.h" +#include "core/math/rect2.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/templates/vector.h" +#include "scene/gui/base_button.h" +#include "scene/gui/control.h" +#include "scene/gui/popup_menu.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/viewport.h" #include "scene/main/window.h" +#include "servers/display_server.h" void MenuButton::unhandled_key_input(const Ref &p_event) { ERR_FAIL_COND(p_event.is_null()); diff --git a/scene/gui/menu_button.h b/scene/gui/menu_button.h index 3647a69d3396..83b8b1dd4686 100644 --- a/scene/gui/menu_button.h +++ b/scene/gui/menu_button.h @@ -31,9 +31,18 @@ #ifndef MENU_BUTTON_H #define MENU_BUTTON_H +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/variant/variant.h" #include "scene/gui/button.h" #include "scene/gui/popup_menu.h" +class InputEvent; +class PopupMenu; + class MenuButton : public Button { GDCLASS(MenuButton, Button); diff --git a/scene/gui/nine_patch_rect.cpp b/scene/gui/nine_patch_rect.cpp index 779d1307f5e2..d19ad98c204b 100644 --- a/scene/gui/nine_patch_rect.cpp +++ b/scene/gui/nine_patch_rect.cpp @@ -30,6 +30,12 @@ #include "nine_patch_rect.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/templates/rid.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/resources/texture.h" #include "scene/scene_string_names.h" #include "servers/rendering_server.h" diff --git a/scene/gui/nine_patch_rect.h b/scene/gui/nine_patch_rect.h index 23aebbb78252..dd4c6bbf5783 100644 --- a/scene/gui/nine_patch_rect.h +++ b/scene/gui/nine_patch_rect.h @@ -31,8 +31,16 @@ #ifndef NINE_PATCH_RECT_H #define NINE_PATCH_RECT_H +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/variant/binder_common.h" #include "scene/gui/control.h" +class Texture2D; + class NinePatchRect : public Control { GDCLASS(NinePatchRect, Control); diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index 9984ab240af0..48c3e7064f96 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -30,7 +30,29 @@ #include "option_button.h" -#include "core/string/print_string.h" +#include + +#include "core/error/error_macros.h" +#include "core/input/input.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "scene/gui/base_button.h" +#include "scene/gui/control.h" +#include "scene/gui/popup_menu.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/viewport.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" static const int NONE_SELECTED = -1; diff --git a/scene/gui/option_button.h b/scene/gui/option_button.h index adf2bb90ef69..451d8cbdc9c6 100644 --- a/scene/gui/option_button.h +++ b/scene/gui/option_button.h @@ -31,9 +31,19 @@ #ifndef OPTION_BUTTON_H #define OPTION_BUTTON_H +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/variant/variant.h" #include "scene/gui/button.h" #include "scene/gui/popup_menu.h" +class PopupMenu; +class Texture2D; + class OptionButton : public Button { GDCLASS(OptionButton, Button); diff --git a/scene/gui/panel.cpp b/scene/gui/panel.cpp index 86858fdc7804..162867996fd4 100644 --- a/scene/gui/panel.cpp +++ b/scene/gui/panel.cpp @@ -30,7 +30,15 @@ #include "panel.h" -#include "core/string/print_string.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/rid.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/resources/style_box.h" void Panel::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/gui/panel.h b/scene/gui/panel.h index 37f14c250cac..366cfc6ebcb2 100644 --- a/scene/gui/panel.h +++ b/scene/gui/panel.h @@ -31,6 +31,8 @@ #ifndef PANEL_H #define PANEL_H +#include "core/object/object.h" +#include "core/variant/binder_common.h" #include "scene/gui/control.h" class Panel : public Control { diff --git a/scene/gui/panel_container.cpp b/scene/gui/panel_container.cpp index 463ad3c51306..825b87a25385 100644 --- a/scene/gui/panel_container.cpp +++ b/scene/gui/panel_container.cpp @@ -30,6 +30,16 @@ #include "panel_container.h" +#include "core/math/rect2.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "scene/gui/control.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/style_box.h" + Size2 PanelContainer::get_minimum_size() const { Ref style; diff --git a/scene/gui/panel_container.h b/scene/gui/panel_container.h index a5ff74cebb58..c38cb0c6c8a0 100644 --- a/scene/gui/panel_container.h +++ b/scene/gui/panel_container.h @@ -31,6 +31,8 @@ #ifndef PANEL_CONTAINER_H #define PANEL_CONTAINER_H +#include "core/math/vector2.h" +#include "core/object/object.h" #include "scene/gui/container.h" class PanelContainer : public Container { diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp index 7c03fcbb3740..d61af2cd03d7 100644 --- a/scene/gui/popup.cpp +++ b/scene/gui/popup.cpp @@ -30,9 +30,23 @@ #include "popup.h" -#include "core/config/engine.h" +#include + +#include "core/error/error_macros.h" +#include "core/input/input_event.h" +#include "core/math/rect2.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/os/keyboard.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" #include "scene/gui/panel.h" +#include "scene/main/node.h" +#include "scene/resources/style_box.h" void Popup::_input_from_window(const Ref &p_event) { Ref key = p_event; diff --git a/scene/gui/popup.h b/scene/gui/popup.h index 5678043b23c4..5032bce9c50c 100644 --- a/scene/gui/popup.h +++ b/scene/gui/popup.h @@ -31,11 +31,15 @@ #ifndef POPUP_H #define POPUP_H -#include "scene/main/window.h" - +#include "core/math/rect2i.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "core/templates/local_vector.h" +#include "scene/main/window.h" class Panel; +class InputEvent; class Popup : public Window { GDCLASS(Popup, Window); diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 479801972051..c2cbcbdd086e 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -30,11 +30,36 @@ #include "popup_menu.h" +#include "core/config/project_settings.h" +#include "core/error/error_macros.h" #include "core/input/input.h" +#include "core/input/input_event.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2i.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/os/keyboard.h" +#include "core/os/memory.h" #include "core/os/os.h" -#include "core/string/print_string.h" #include "core/string/translation.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "scene/gui/margin_container.h" +#include "scene/gui/scroll_bar.h" +#include "scene/gui/scroll_container.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/timer.h" +#include "scene/main/viewport.h" +#include "scene/main/window.h" +#include "scene/resources/font.h" +#include "scene/resources/style_box.h" +#include "servers/display_server.h" +#include "servers/text_server.h" String PopupMenu::_get_accel_text(const Item &p_item) const { if (p_item.shortcut.is_valid()) { diff --git a/scene/gui/popup_menu.h b/scene/gui/popup_menu.h index 7c2212d82dfd..9f3f904bd10f 100644 --- a/scene/gui/popup_menu.h +++ b/scene/gui/popup_menu.h @@ -31,11 +31,33 @@ #ifndef POPUP_MENU_H #define POPUP_MENU_H +#include + +#include "core/input/input_enums.h" #include "core/input/shortcut.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/keyboard.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" #include "scene/gui/margin_container.h" #include "scene/gui/popup.h" #include "scene/gui/scroll_container.h" #include "scene/resources/text_line.h" +#include "scene/resources/texture.h" + +class InputEvent; +class MarginContainer; +class ScrollContainer; +class Timer; class PopupMenu : public Popup { GDCLASS(PopupMenu, Popup); diff --git a/scene/gui/progress_bar.cpp b/scene/gui/progress_bar.cpp index c20fb0d7a86d..f51b48ef8468 100644 --- a/scene/gui/progress_bar.cpp +++ b/scene/gui/progress_bar.cpp @@ -29,7 +29,21 @@ /*************************************************************************/ #include "progress_bar.h" + +#include "core/math/color.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/resources/style_box.h" #include "scene/resources/text_line.h" +#include "servers/text_server.h" + +class Font; Size2 ProgressBar::get_minimum_size() const { Ref bg = get_theme_stylebox(SNAME("bg")); diff --git a/scene/gui/progress_bar.h b/scene/gui/progress_bar.h index 2d89163f784e..923c237b9c15 100644 --- a/scene/gui/progress_bar.h +++ b/scene/gui/progress_bar.h @@ -31,6 +31,8 @@ #ifndef PROGRESS_BAR_H #define PROGRESS_BAR_H +#include "core/math/vector2.h" +#include "core/object/object.h" #include "scene/gui/range.h" class ProgressBar : public Range { diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp index 879f25c8d8ad..ab6d048d39c5 100644 --- a/scene/gui/range.cpp +++ b/scene/gui/range.cpp @@ -30,6 +30,18 @@ #include "range.h" +#include + +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/node.h" + TypedArray Range::get_configuration_warnings() const { TypedArray warnings = Node::get_configuration_warnings(); diff --git a/scene/gui/range.h b/scene/gui/range.h index c27eeee13c9d..aee4e802fff9 100644 --- a/scene/gui/range.h +++ b/scene/gui/range.h @@ -31,8 +31,14 @@ #ifndef RANGE_H #define RANGE_H +#include "core/object/object.h" +#include "core/templates/set.h" +#include "core/variant/typed_array.h" #include "scene/gui/control.h" +class Node; +class String; + class Range : public Control { GDCLASS(Range, Control); diff --git a/scene/gui/reference_rect.cpp b/scene/gui/reference_rect.cpp index e2a0d568a17c..f9df38d709b5 100644 --- a/scene/gui/reference_rect.cpp +++ b/scene/gui/reference_rect.cpp @@ -31,6 +31,12 @@ #include "reference_rect.h" #include "core/config/engine.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" void ReferenceRect::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/gui/reference_rect.h b/scene/gui/reference_rect.h index 4a2d32816203..f2f92f7ea344 100644 --- a/scene/gui/reference_rect.h +++ b/scene/gui/reference_rect.h @@ -31,6 +31,8 @@ #ifndef REFERENCE_RECT_H #define REFERENCE_RECT_H +#include "core/math/color.h" +#include "core/object/object.h" #include "scene/gui/control.h" class ReferenceRect : public Control { diff --git a/scene/gui/rich_text_effect.cpp b/scene/gui/rich_text_effect.cpp index c9516ed6b91a..8e0b7fe3e79e 100644 --- a/scene/gui/rich_text_effect.cpp +++ b/scene/gui/rich_text_effect.cpp @@ -30,6 +30,7 @@ #include "rich_text_effect.h" +#include "core/object/class_db.h" #include "core/object/script_language.h" CharFXTransform::CharFXTransform() { diff --git a/scene/gui/rich_text_effect.h b/scene/gui/rich_text_effect.h index 4532a812eeaa..3d137d48b71c 100644 --- a/scene/gui/rich_text_effect.h +++ b/scene/gui/rich_text_effect.h @@ -31,9 +31,21 @@ #ifndef RICH_TEXT_EFFECT_H #define RICH_TEXT_EFFECT_H +#include + #include "core/io/resource.h" +#include "core/math/color.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" #include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "core/object/script_language.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" class CharFXTransform : public RefCounted { GDCLASS(CharFXTransform, RefCounted); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 4865b9770e11..7107d2d94fe1 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -30,13 +30,27 @@ #include "rich_text_label.h" -#include "core/math/math_defs.h" -#include "core/os/keyboard.h" -#include "core/os/os.h" -#include "scene/scene_string_names.h" -#include "servers/display_server.h" +#include +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/io/resource_loader.h" +#include "core/math/math_defs.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/node_path.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" #include "modules/modules_enabled.gen.h" // For regex. +#include "scene/gui/rich_text_effect.h" +#include "scene/gui/scroll_bar.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/style_box.h" +#include "servers/display_server.h" +#include "servers/rendering_server.h" #ifdef MODULE_REGEX_ENABLED #include "modules/regex/regex.h" #endif diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index e79244f2e438..7ba6a56c397f 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -31,9 +31,36 @@ #ifndef RICH_TEXT_LABEL_H #define RICH_TEXT_LABEL_H +#include + +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "rich_text_effect.h" +#include "scene/gui/control.h" #include "scene/gui/scroll_bar.h" +#include "scene/resources/font.h" #include "scene/resources/text_paragraph.h" +#include "scene/resources/texture.h" +#include "servers/text_server.h" + +class InputEvent; +class RID; +class VScrollBar; class RichTextLabel : public Control { GDCLASS(RichTextLabel, Control); diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 343056957c0e..c5db61a957bd 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -30,10 +30,26 @@ #include "scroll_bar.h" -#include "core/os/keyboard.h" -#include "core/os/os.h" -#include "core/string/print_string.h" -#include "scene/main/window.h" +#include + +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/viewport.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" +#include "servers/display_server.h" bool ScrollBar::focus_by_default = false; diff --git a/scene/gui/scroll_bar.h b/scene/gui/scroll_bar.h index 651edd1a7472..a32b12f5de5e 100644 --- a/scene/gui/scroll_bar.h +++ b/scene/gui/scroll_bar.h @@ -31,8 +31,16 @@ #ifndef SCROLL_BAR_H #define SCROLL_BAR_H +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" #include "scene/gui/range.h" +class InputEvent; +class Node; + class ScrollBar : public Range { GDCLASS(ScrollBar, Range); diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 5e128d594c68..792c904ddc19 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -29,8 +29,29 @@ /*************************************************************************/ #include "scroll_container.h" -#include "core/os/os.h" -#include "scene/main/window.h" + +#include "core/config/project_settings.h" +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/gui/container.h" +#include "scene/gui/control.h" +#include "scene/gui/scroll_bar.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/viewport.h" +#include "scene/resources/style_box.h" +#include "servers/display_server.h" Size2 ScrollContainer::get_minimum_size() const { Ref sb = get_theme_stylebox(SNAME("bg")); diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h index c00df87b18b4..72b0dd8a88d4 100644 --- a/scene/gui/scroll_container.h +++ b/scene/gui/scroll_container.h @@ -32,9 +32,19 @@ #define SCROLL_CONTAINER_H #include "container.h" - +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scroll_bar.h" +class Control; +class HScrollBar; +class InputEvent; +class String; +class VScrollBar; + class ScrollContainer : public Container { GDCLASS(ScrollContainer, Container); diff --git a/scene/gui/separator.cpp b/scene/gui/separator.cpp index 9c19eb54dc9c..22cf95e28a70 100644 --- a/scene/gui/separator.cpp +++ b/scene/gui/separator.cpp @@ -30,6 +30,13 @@ #include "separator.h" +#include "core/math/rect2.h" +#include "core/math/vector2i.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "scene/main/canvas_item.h" +#include "scene/resources/style_box.h" + Size2 Separator::get_minimum_size() const { Size2 ms(3, 3); if (orientation == VERTICAL) { diff --git a/scene/gui/separator.h b/scene/gui/separator.h index 1621bb335133..6e31dfcd548d 100644 --- a/scene/gui/separator.h +++ b/scene/gui/separator.h @@ -31,7 +31,11 @@ #ifndef SEPARATOR_H #define SEPARATOR_H +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" #include "scene/gui/control.h" + class Separator : public Control { GDCLASS(Separator, Control); diff --git a/scene/gui/slider.cpp b/scene/gui/slider.cpp index 1d459d589f15..6a955e1da9e9 100644 --- a/scene/gui/slider.cpp +++ b/scene/gui/slider.cpp @@ -29,7 +29,24 @@ /*************************************************************************/ #include "slider.h" -#include "core/os/keyboard.h" + +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/math/rect2i.h" +#include "core/math/vector2i.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" Size2 Slider::get_minimum_size() const { Ref style = get_theme_stylebox(SNAME("slider")); diff --git a/scene/gui/slider.h b/scene/gui/slider.h index 5fbfee2aec28..a4f5e60b1025 100644 --- a/scene/gui/slider.h +++ b/scene/gui/slider.h @@ -31,8 +31,14 @@ #ifndef SLIDER_H #define SLIDER_H +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "scene/gui/range.h" +class InputEvent; + class Slider : public Range { GDCLASS(Slider, Range); diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index 19d47ea492fa..47ac9562e9e0 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -30,8 +30,30 @@ #include "spin_box.h" +#include "core/error/error_list.h" +#include "core/error/error_macros.h" #include "core/input/input.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" #include "core/math/expression.h" +#include "core/math/math_funcs.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/string_name.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" +#include "scene/gui/line_edit.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/timer.h" +#include "scene/resources/texture.h" +#include "servers/text_server.h" Size2 SpinBox::get_minimum_size() const { Size2 ms = line_edit->get_combined_minimum_size(); diff --git a/scene/gui/spin_box.h b/scene/gui/spin_box.h index 0691a4b48d93..9a9d132ec8f3 100644 --- a/scene/gui/spin_box.h +++ b/scene/gui/spin_box.h @@ -31,10 +31,20 @@ #ifndef SPIN_BOX_H #define SPIN_BOX_H +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" #include "scene/gui/line_edit.h" #include "scene/gui/range.h" #include "scene/main/timer.h" +class InputEvent; +class LineEdit; +class Texture2D; +class Timer; + class SpinBox : public Range { GDCLASS(SpinBox, Range); diff --git a/scene/gui/split_container.cpp b/scene/gui/split_container.cpp index 874e5868b6ed..e7e342f5a64c 100644 --- a/scene/gui/split_container.cpp +++ b/scene/gui/split_container.cpp @@ -30,8 +30,17 @@ #include "split_container.h" -#include "label.h" -#include "margin_container.h" +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/texture.h" Control *SplitContainer::_getch(int p_idx) const { int idx = 0; diff --git a/scene/gui/split_container.h b/scene/gui/split_container.h index ba6fff6f5513..4ce00f57541f 100644 --- a/scene/gui/split_container.h +++ b/scene/gui/split_container.h @@ -31,7 +31,15 @@ #ifndef SPLIT_CONTAINER_H #define SPLIT_CONTAINER_H +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/variant/binder_common.h" #include "scene/gui/container.h" +#include "scene/gui/control.h" + +class InputEvent; class SplitContainer : public Container { GDCLASS(SplitContainer, Container); diff --git a/scene/gui/subviewport_container.cpp b/scene/gui/subviewport_container.cpp index 760144591ece..1c33eeb88dbb 100644 --- a/scene/gui/subviewport_container.cpp +++ b/scene/gui/subviewport_container.cpp @@ -31,7 +31,19 @@ #include "subviewport_container.h" #include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/input/input_event.h" +#include "core/math/rect2.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2i.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" #include "scene/main/viewport.h" +#include "scene/resources/texture.h" Size2 SubViewportContainer::get_minimum_size() const { if (stretch) { diff --git a/scene/gui/subviewport_container.h b/scene/gui/subviewport_container.h index e7520763fb37..04166b2faacd 100644 --- a/scene/gui/subviewport_container.h +++ b/scene/gui/subviewport_container.h @@ -31,8 +31,13 @@ #ifndef VIEWPORTCONTAINER_H #define VIEWPORTCONTAINER_H +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "scene/gui/container.h" +class InputEvent; + class SubViewportContainer : public Container { GDCLASS(SubViewportContainer, Container); diff --git a/scene/gui/tab_bar.cpp b/scene/gui/tab_bar.cpp index 5a551ec5a572..7a3f0ca33f41 100644 --- a/scene/gui/tab_bar.cpp +++ b/scene/gui/tab_bar.cpp @@ -30,12 +30,31 @@ #include "tab_bar.h" -#include "core/object/message_queue.h" +#include + +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/node_path.h" #include "core/string/translation.h" - +#include "core/templates/rid.h" +#include "core/typedefs.h" #include "scene/gui/box_container.h" #include "scene/gui/label.h" #include "scene/gui/texture_rect.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/style_box.h" +#include "servers/text_server.h" + +class Font; Size2 TabBar::get_minimum_size() const { Size2 ms; diff --git a/scene/gui/tab_bar.h b/scene/gui/tab_bar.h index b4285385701d..4a9c3b766b51 100644 --- a/scene/gui/tab_bar.h +++ b/scene/gui/tab_bar.h @@ -31,8 +31,24 @@ #ifndef TAB_BAR_H #define TAB_BAR_H +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/gui/control.h" #include "scene/resources/text_line.h" +#include "scene/resources/texture.h" + +class InputEvent; +class StyleBox; +struct Color; class TabBar : public Control { GDCLASS(TabBar, Control); diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index 818431a6a07a..7e516d7a11dd 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -30,12 +30,33 @@ #include "tab_container.h" -#include "core/object/message_queue.h" +#include "core/error/error_macros.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" #include "core/string/translation.h" - +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/dictionary.h" #include "scene/gui/box_container.h" +#include "scene/gui/control.h" #include "scene/gui/label.h" +#include "scene/gui/popup.h" #include "scene/gui/texture_rect.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/font.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" +#include "servers/text_server.h" int TabContainer::_get_top_margin() const { if (!tabs_visible) { diff --git a/scene/gui/tab_container.h b/scene/gui/tab_container.h index 01e71e9fa8b9..8029318db0fc 100644 --- a/scene/gui/tab_container.h +++ b/scene/gui/tab_container.h @@ -31,10 +31,27 @@ #ifndef TAB_CONTAINER_H #define TAB_CONTAINER_H +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/gui/container.h" #include "scene/gui/popup.h" #include "scene/resources/text_line.h" +class Control; +class InputEvent; +class Node; +class Popup; +class StyleBox; +class Texture2D; +struct Color; + class TabContainer : public Container { GDCLASS(TabContainer, Container); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index bb259843b88c..02b6cf86e0bb 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -30,18 +30,38 @@ #include "text_edit.h" +#include + +#include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/error/error_macros.h" #include "core/input/input.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" #include "core/input/input_map.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" -#include "core/object/script_language.h" #include "core/os/keyboard.h" +#include "core/os/main_loop.h" +#include "core/os/memory.h" #include "core/os/os.h" +#include "core/string/char_utils.h" #include "core/string/string_builder.h" #include "core/string/translation.h" +#include "core/templates/rid.h" #include "label.h" - -#include "scene/main/window.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/timer.h" +#include "scene/main/viewport.h" +#include "scene/resources/text_line.h" +#include "servers/display_server.h" +#include "servers/rendering_server.h" /////////////////////////////////////////////////////////////////////////////// /// TEXT /// diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index 83a63ae40a2e..58c086705dd2 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -31,12 +31,44 @@ #ifndef TEXT_EDIT_H #define TEXT_EDIT_H +#include + +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2i.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/keyboard.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/callable.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/gui/control.h" #include "scene/gui/popup_menu.h" #include "scene/gui/scroll_bar.h" #include "scene/main/timer.h" +#include "scene/resources/font.h" +#include "scene/resources/style_box.h" #include "scene/resources/syntax_highlighter.h" #include "scene/resources/text_paragraph.h" +#include "scene/resources/texture.h" +#include "servers/text_server.h" + +class HScrollBar; +class InputEvent; +class PopupMenu; +class Timer; +class VScrollBar; class TextEdit : public Control { GDCLASS(TextEdit, Control); diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp index 26acfaaa70ee..f7452475aadc 100644 --- a/scene/gui/texture_button.cpp +++ b/scene/gui/texture_button.cpp @@ -30,9 +30,13 @@ #include "texture_button.h" +#include "core/math/math_funcs.h" +#include "core/math/vector2i.h" +#include "core/object/class_db.h" #include "core/typedefs.h" - -#include +#include "core/variant/variant.h" +#include "scene/gui/control.h" +#include "scene/main/canvas_item.h" Size2 TextureButton::get_minimum_size() const { Size2 rscale = Control::get_minimum_size(); diff --git a/scene/gui/texture_button.h b/scene/gui/texture_button.h index 5762949acd80..6b941c03c0c1 100644 --- a/scene/gui/texture_button.h +++ b/scene/gui/texture_button.h @@ -31,8 +31,15 @@ #ifndef TEXTURE_BUTTON_H #define TEXTURE_BUTTON_H +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/variant/binder_common.h" #include "scene/gui/base_button.h" #include "scene/resources/bit_map.h" +#include "scene/resources/texture.h" + class TextureButton : public BaseButton { GDCLASS(TextureButton, BaseButton); diff --git a/scene/gui/texture_progress_bar.cpp b/scene/gui/texture_progress_bar.cpp index 043c0f464c7c..8fa4d0e17618 100644 --- a/scene/gui/texture_progress_bar.cpp +++ b/scene/gui/texture_progress_bar.cpp @@ -31,6 +31,18 @@ #include "texture_progress_bar.h" #include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" +#include "scene/gui/control.h" +#include "scene/main/canvas_item.h" +#include "servers/rendering_server.h" void TextureProgressBar::set_under_texture(const Ref &p_texture) { under = p_texture; diff --git a/scene/gui/texture_progress_bar.h b/scene/gui/texture_progress_bar.h index 4d3e38e006f1..fc82df93e291 100644 --- a/scene/gui/texture_progress_bar.h +++ b/scene/gui/texture_progress_bar.h @@ -31,7 +31,14 @@ #ifndef TEXTURE_PROGRESS_BAR_H #define TEXTURE_PROGRESS_BAR_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/variant/binder_common.h" #include "scene/gui/range.h" +#include "scene/resources/texture.h" class TextureProgressBar : public Range { GDCLASS(TextureProgressBar, Range); diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp index a8cdeb44f591..ea113d916ab8 100644 --- a/scene/gui/texture_rect.cpp +++ b/scene/gui/texture_rect.cpp @@ -29,8 +29,14 @@ /*************************************************************************/ #include "texture_rect.h" + #include "core/core_string_names.h" -#include "servers/rendering_server.h" +#include "core/math/rect2.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/resources/texture.h" void TextureRect::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { diff --git a/scene/gui/texture_rect.h b/scene/gui/texture_rect.h index 7d667b25a865..9e010c873472 100644 --- a/scene/gui/texture_rect.h +++ b/scene/gui/texture_rect.h @@ -31,8 +31,14 @@ #ifndef TEXTURE_RECT_H #define TEXTURE_RECT_H +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/variant/binder_common.h" #include "scene/gui/control.h" +class Texture2D; + class TextureRect : public Control { GDCLASS(TextureRect, Control); diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index e33ce0b017e9..a0032191551c 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -30,18 +30,35 @@ #include "tree.h" +#include + +#include "box_container.h" #include "core/config/project_settings.h" +#include "core/error/error_macros.h" #include "core/input/input.h" +#include "core/input/input_event.h" #include "core/math/math_funcs.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/object/method_bind.h" #include "core/os/keyboard.h" +#include "core/os/memory.h" #include "core/os/os.h" -#include "core/string/print_string.h" #include "core/string/translation.h" -#include "scene/main/window.h" - -#include "box_container.h" - -#include +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/popup.h" +#include "scene/gui/popup_menu.h" +#include "scene/gui/scroll_bar.h" +#include "scene/gui/slider.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/main/timer.h" +#include "scene/main/viewport.h" +#include "servers/display_server.h" +#include "servers/rendering_server.h" +#include "servers/text_server.h" Size2 TreeItem::Cell::get_icon_size() const { if (icon.is_null()) { diff --git a/scene/gui/tree.h b/scene/gui/tree.h index c24763a0e44b..5f2f19dae6c0 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -31,14 +31,48 @@ #ifndef TREE_H #define TREE_H +#include + +#include "core/input/input_enums.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/rect2i.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/callable.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/gui/control.h" #include "scene/gui/line_edit.h" #include "scene/gui/popup_menu.h" #include "scene/gui/scroll_bar.h" #include "scene/gui/slider.h" +#include "scene/resources/font.h" +#include "scene/resources/style_box.h" #include "scene/resources/text_line.h" +#include "scene/resources/texture.h" class Tree; +class HScrollBar; +class HSlider; +class InputEvent; +class InputEventWithModifiers; +class LineEdit; +class Popup; +class PopupMenu; +class RID; +class Timer; +class VScrollBar; class TreeItem : public Object { GDCLASS(TreeItem, Object); diff --git a/scene/gui/video_stream_player.cpp b/scene/gui/video_stream_player.cpp index 1f2a8c8aa1c6..b37ab32c544d 100644 --- a/scene/gui/video_stream_player.cpp +++ b/scene/gui/video_stream_player.cpp @@ -30,7 +30,19 @@ #include "video_stream_player.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" #include "core/os/os.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/main/canvas_item.h" +#include "scene/main/node.h" +#include "scene/resources/texture.h" +#include "scene/resources/video_stream.h" #include "scene/scene_string_names.h" #include "servers/audio_server.h" diff --git a/scene/gui/video_stream_player.h b/scene/gui/video_stream_player.h index 130b2901f146..bc13575a2617 100644 --- a/scene/gui/video_stream_player.h +++ b/scene/gui/video_stream_player.h @@ -31,11 +31,25 @@ #ifndef VIDEO_STREAM_PLAYER_H #define VIDEO_STREAM_PLAYER_H +#include "core/math/audio_frame.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" #include "scene/gui/control.h" #include "scene/resources/video_stream.h" #include "servers/audio/audio_rb_resampler.h" #include "servers/audio_server.h" +class ImageTexture; +class Texture2D; +class VideoStream; +class VideoStreamPlayback; +class Viewport; + class VideoStreamPlayer : public Control { GDCLASS(VideoStreamPlayer, Control); diff --git a/scene/gui/view_panner.cpp b/scene/gui/view_panner.cpp index 71865b4864b3..ab5b735d4d19 100644 --- a/scene/gui/view_panner.cpp +++ b/scene/gui/view_panner.cpp @@ -31,8 +31,14 @@ #include "view_panner.h" #include "core/input/input.h" +#include "core/input/input_enums.h" +#include "core/input/input_event.h" #include "core/input/shortcut.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" #include "core/os/keyboard.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" bool ViewPanner::gui_input(const Ref &p_event, Rect2 p_canvas_rect) { Ref mb = p_event; diff --git a/scene/gui/view_panner.h b/scene/gui/view_panner.h index 5b820c5f8f22..872899321ee8 100644 --- a/scene/gui/view_panner.h +++ b/scene/gui/view_panner.h @@ -31,10 +31,16 @@ #ifndef VIEW_PANNER_H #define VIEW_PANNER_H +#include "core/input/shortcut.h" +#include "core/math/rect2.h" +#include "core/object/object.h" #include "core/object/ref_counted.h" +#include "core/templates/vector.h" +#include "core/variant/callable.h" class InputEvent; class Shortcut; +class Variant; class ViewPanner : public RefCounted { GDCLASS(ViewPanner, RefCounted); diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp index a62bbb146c00..7791a4592b29 100644 --- a/scene/main/canvas_item.cpp +++ b/scene/main/canvas_item.cpp @@ -30,12 +30,22 @@ #include "canvas_item.h" +#include "core/error/error_macros.h" +#include "core/input/input_event.h" +#include "core/io/image.h" +#include "core/math/math_funcs.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" +#include "core/variant/variant.h" #include "scene/2d/canvas_group.h" #include "scene/main/canvas_layer.h" +#include "scene/main/viewport.h" #include "scene/main/window.h" -#include "scene/resources/canvas_item_material.h" #include "scene/resources/font.h" +#include "scene/resources/material.h" +#include "scene/resources/mesh.h" #include "scene/resources/multimesh.h" #include "scene/resources/style_box.h" #include "scene/resources/world_2d.h" diff --git a/scene/main/canvas_item.h b/scene/main/canvas_item.h index 08fea52c3a7c..d4bb191b5a9e 100644 --- a/scene/main/canvas_item.h +++ b/scene/main/canvas_item.h @@ -31,10 +31,32 @@ #ifndef CANVAS_ITEM_H #define CANVAS_ITEM_H +#include + +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/self_list.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" #include "scene/main/node.h" #include "scene/main/scene_tree.h" #include "scene/resources/canvas_item_material.h" #include "scene/resources/font.h" +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" #include "servers/text_server.h" class CanvasLayer; @@ -42,6 +64,10 @@ class MultiMesh; class StyleBox; class Window; class World2D; +class Image; +class InputEvent; +class Material; +class Mesh; class CanvasItem : public Node { GDCLASS(CanvasItem, Node); diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp index 3f3e72357b6e..7639d3d6ccfa 100644 --- a/scene/main/canvas_layer.cpp +++ b/scene/main/canvas_layer.cpp @@ -29,7 +29,17 @@ /*************************************************************************/ #include "canvas_layer.h" + #include "canvas_item.h" +#include "core/error/error_macros.h" +#include "core/math/rect2.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/resources/world_2d.h" +#include "servers/rendering_server.h" #include "viewport.h" void CanvasLayer::set_layer(int p_xform) { diff --git a/scene/main/canvas_layer.h b/scene/main/canvas_layer.h index b7bd793440a1..18a9199c6a44 100644 --- a/scene/main/canvas_layer.h +++ b/scene/main/canvas_layer.h @@ -31,9 +31,16 @@ #ifndef CANVAS_LAYER_H #define CANVAS_LAYER_H +#include "core/math/math_defs.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/templates/rid.h" #include "scene/main/node.h" class Viewport; + class CanvasLayer : public Node { GDCLASS(CanvasLayer, Node); diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp index 4e91548d144e..07fef6a04545 100644 --- a/scene/main/http_request.cpp +++ b/scene/main/http_request.cpp @@ -29,7 +29,18 @@ /*************************************************************************/ #include "http_request.h" + +#include + +#include "core/error/error_macros.h" #include "core/io/compression.h" +#include "core/io/file_access.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/os/os.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" #include "scene/main/timer.h" void HTTPRequest::_redirect_request(const String &p_new_url) { diff --git a/scene/main/http_request.h b/scene/main/http_request.h index 62880fa282b0..cad9ccb341c0 100644 --- a/scene/main/http_request.h +++ b/scene/main/http_request.h @@ -31,12 +31,22 @@ #ifndef HTTPREQUEST_H #define HTTPREQUEST_H +#include + +#include "core/error/error_list.h" #include "core/io/http_client.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "core/os/thread.h" +#include "core/string/ustring.h" #include "core/templates/safe_refcount.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/main/node.h" class Timer; +class FileAccess; class HTTPRequest : public Node { GDCLASS(HTTPRequest, Node); diff --git a/scene/main/instance_placeholder.cpp b/scene/main/instance_placeholder.cpp index 6dd83e463691..db2e2ca46fa6 100644 --- a/scene/main/instance_placeholder.cpp +++ b/scene/main/instance_placeholder.cpp @@ -30,7 +30,9 @@ #include "instance_placeholder.h" +#include "core/error/error_macros.h" #include "core/io/resource_loader.h" +#include "core/object/class_db.h" #include "scene/resources/packed_scene.h" bool InstancePlaceholder::_set(const StringName &p_name, const Variant &p_value) { diff --git a/scene/main/instance_placeholder.h b/scene/main/instance_placeholder.h index 8f2eb01773be..9aa5302d5c36 100644 --- a/scene/main/instance_placeholder.h +++ b/scene/main/instance_placeholder.h @@ -31,7 +31,15 @@ #ifndef INSTANCE_PLACEHOLDER_H #define INSTANCE_PLACEHOLDER_H +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/main/node.h" +#include "scene/resources/packed_scene.h" class PackedScene; diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 6b9d8ab2112d..1eb393f52ae0 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -30,11 +30,24 @@ #include "node.h" +#include + +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "core/core_string_names.h" +#include "core/input/input_event.h" #include "core/io/resource_loader.h" #include "core/multiplayer/multiplayer_api.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" +#include "core/object/method_bind.h" +#include "core/object/object_id.h" +#include "core/object/script_language.h" +#include "core/os/memory.h" +#include "core/string/char_utils.h" #include "core/string/print_string.h" +#include "core/templates/pair.h" +#include "core/templates/safe_refcount.h" #include "instance_placeholder.h" #include "scene/animation/tween.h" #include "scene/debugger/scene_debugger.h" @@ -42,8 +55,6 @@ #include "scene/scene_string_names.h" #include "viewport.h" -#include - VARIANT_ENUM_CAST(Node::ProcessMode); VARIANT_ENUM_CAST(Node::InternalMode); diff --git a/scene/main/node.h b/scene/main/node.h index 0ac10f4381fa..d96c9477b29b 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -31,18 +31,39 @@ #ifndef NODE_H #define NODE_H +#include + #include "core/config/project_settings.h" +#include "core/error/error_macros.h" +#include "core/io/resource.h" +#include "core/multiplayer/multiplayer.h" #include "core/object/class_db.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "core/object/script_language.h" +#include "core/os/main_loop.h" #include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" #include "core/templates/map.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/callable.h" #include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/main/scene_tree.h" class Viewport; class SceneState; class Tween; class PropertyTweener; +class InputEvent; +class MultiplayerAPI; class Node : public Object { GDCLASS(Node, Object); diff --git a/scene/main/resource_preloader.cpp b/scene/main/resource_preloader.cpp index 49010095ffe2..2dd02142af87 100644 --- a/scene/main/resource_preloader.cpp +++ b/scene/main/resource_preloader.cpp @@ -30,6 +30,15 @@ #include "resource_preloader.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/pair.h" +#include "core/templates/set.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" + void ResourcePreloader::_set_resources(const Array &p_data) { resources.clear(); diff --git a/scene/main/resource_preloader.h b/scene/main/resource_preloader.h index aabb109d5635..4ddbff05fa4d 100644 --- a/scene/main/resource_preloader.h +++ b/scene/main/resource_preloader.h @@ -31,8 +31,17 @@ #ifndef RESOURCE_PRELOADER_H #define RESOURCE_PRELOADER_H +#include "core/io/resource.h" +#include "core/object/object.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" #include "scene/main/node.h" +class String; + class ResourcePreloader : public Node { GDCLASS(ResourcePreloader, Node); diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 69d781cbfcd0..47b049701037 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -30,33 +30,38 @@ #include "scene_tree.h" +#include + +#include "core/config/engine.h" #include "core/config/project_settings.h" -#include "core/debugger/engine_debugger.h" +#include "core/error/error_macros.h" #include "core/input/input.h" #include "core/io/dir_access.h" -#include "core/io/marshalls.h" #include "core/io/resource_loader.h" +#include "core/math/math_funcs.h" +#include "core/math/vector3.h" #include "core/multiplayer/multiplayer_api.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" -#include "core/os/keyboard.h" +#include "core/object/method_bind.h" +#include "core/os/memory.h" #include "core/os/os.h" -#include "core/string/print_string.h" +#include "core/templates/sort_array.h" #include "node.h" #include "scene/animation/tween.h" -#include "scene/debugger/scene_debugger.h" -#include "scene/resources/font.h" +#include "scene/main/viewport.h" +#include "scene/resources/environment.h" #include "scene/resources/material.h" #include "scene/resources/mesh.h" #include "scene/resources/packed_scene.h" -#include "scene/scene_string_names.h" -#include "servers/display_server.h" +#include "scene/resources/world_3d.h" #include "servers/navigation_server_3d.h" #include "servers/physics_server_2d.h" #include "servers/physics_server_3d.h" #include "window.h" -#include -#include +class InputEvent; void SceneTreeTimer::_bind_methods() { ClassDB::bind_method(D_METHOD("set_time_left", "time"), &SceneTreeTimer::set_time_left); diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h index a5cd52b4ca15..387ec6484213 100644 --- a/scene/main/scene_tree.h +++ b/scene/main/scene_tree.h @@ -31,13 +31,37 @@ #ifndef SCENE_TREE_H #define SCENE_TREE_H +#include +#include + +#include "core/error/error_list.h" +#include "core/math/color.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" #include "core/os/main_loop.h" #include "core/os/thread_safe.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" #include "core/templates/self_list.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/callable.h" +#include "core/variant/variant.h" +#include "scene/animation/tween.h" #include "scene/resources/mesh.h" #include "scene/resources/world_2d.h" #include "scene/resources/world_3d.h" +class ArrayMesh; +class InputEvent; +class Viewport; + #undef Window class PackedScene; diff --git a/scene/main/shader_globals_override.cpp b/scene/main/shader_globals_override.cpp index 240e662efb99..778879d2e3de 100644 --- a/scene/main/shader_globals_override.cpp +++ b/scene/main/shader_globals_override.cpp @@ -30,8 +30,15 @@ #include "shader_globals_override.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/callable.h" #include "scene/3d/node_3d.h" +#include "scene/main/scene_tree.h" #include "scene/scene_string_names.h" +#include "servers/rendering_server.h" StringName *ShaderGlobalsOverride::_remap(const StringName &p_name) const { StringName *r = param_remaps.getptr(p_name); diff --git a/scene/main/shader_globals_override.h b/scene/main/shader_globals_override.h index af99bf9aa745..8b6f5e115db3 100644 --- a/scene/main/shader_globals_override.h +++ b/scene/main/shader_globals_override.h @@ -31,8 +31,16 @@ #ifndef SHADER_GLOBALS_OVERRIDE_H #define SHADER_GLOBALS_OVERRIDE_H +#include "core/object/object.h" +#include "core/string/string_name.h" +#include "core/templates/hash_map.h" +#include "core/templates/list.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/main/node.h" +class String; + class ShaderGlobalsOverride : public Node { GDCLASS(ShaderGlobalsOverride, Node); diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index babe62f453b8..de745c3290a2 100644 --- a/scene/main/timer.cpp +++ b/scene/main/timer.cpp @@ -30,6 +30,15 @@ #include "timer.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/math_defs.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" +#include "scene/main/scene_tree.h" + void Timer::_notification(int p_what) { switch (p_what) { case NOTIFICATION_READY: { diff --git a/scene/main/timer.h b/scene/main/timer.h index 8785d31a8af2..6bfa230b4b9d 100644 --- a/scene/main/timer.h +++ b/scene/main/timer.h @@ -31,8 +31,13 @@ #ifndef TIMER_H #define TIMER_H +#include "core/object/object.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" #include "scene/main/node.h" +class String; + class Timer : public Node { GDCLASS(Timer, Node); diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 522997cdf527..c133f8c0f7b3 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -30,14 +30,33 @@ #include "viewport.h" +#include "core/config/engine.h" +#include "core/config/project_settings.h" #include "core/core_string_names.h" #include "core/debugger/engine_debugger.h" +#include "core/error/error_macros.h" +#include "core/input/input.h" +#include "core/io/image.h" +#include "core/math/color.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" #include "core/object/message_queue.h" +#include "core/os/memory.h" #include "core/string/translation.h" #include "core/templates/pair.h" +#include "core/variant/dictionary.h" +#include "core/variant/typed_array.h" #include "scene/2d/audio_listener_2d.h" #include "scene/2d/camera_2d.h" #include "scene/2d/collision_object_2d.h" +#include "scene/3d/node_3d.h" +#include "scene/main/canvas_item.h" +#include "scene/resources/style_box.h" +#include "scene/resources/world_3d.h" +#include "servers/physics_server_2d.h" +#include "servers/physics_server_3d.h" +#include "servers/rendering_server.h" +#include "servers/text_server.h" #ifndef _3D_DISABLED #include "scene/3d/audio_listener_3d.h" #include "scene/3d/camera_3d.h" @@ -54,9 +73,9 @@ #include "scene/resources/mesh.h" #include "scene/resources/text_line.h" #include "scene/resources/world_2d.h" -#include "scene/scene_string_names.h" #include "servers/audio_server.h" -#include "servers/rendering/rendering_server_globals.h" + +class Font; void ViewportTexture::setup_local_to_scene() { Node *local_scene = get_local_scene(); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 3a71745f4484..c21f0c444bd5 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -31,8 +31,41 @@ #ifndef VIEWPORT_H #define VIEWPORT_H +#include +#include + +#include "core/input/input_enums.h" +#include "core/input/input_event.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/rect2i.h" +#include "core/math/transform_2d.h" +#include "core/math/transform_3d.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/pair.h" +#include "core/templates/rid.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/main/node.h" +#include "scene/main/scene_tree.h" #include "scene/resources/texture.h" +#include "servers/display_server.h" + +class Image; #ifndef _3D_DISABLED class Camera3D; diff --git a/scene/main/window.cpp b/scene/main/window.cpp index f2ebe50fa309..b89ef65a7ea7 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -30,10 +30,30 @@ #include "window.h" +#include + +#include "core/config/project_settings.h" #include "core/debugger/engine_debugger.h" +#include "core/error/error_macros.h" +#include "core/input/input_event.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/math/transform_2d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/keyboard.h" +#include "core/os/main_loop.h" #include "core/string/translation.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" #include "scene/gui/control.h" +#include "scene/main/node.h" +#include "scene/resources/theme.h" #include "scene/scene_string_names.h" +#include "servers/rendering_server.h" +#include "servers/text_server.h" + +class Texture2D; void Window::set_title(const String &p_title) { title = p_title; diff --git a/scene/main/window.h b/scene/main/window.h index f37689f9056b..ca1b2783de15 100644 --- a/scene/main/window.h +++ b/scene/main/window.h @@ -31,12 +31,30 @@ #ifndef WINDOW_H #define WINDOW_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2i.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" #include "scene/main/viewport.h" +#include "servers/display_server.h" class Control; class Font; class StyleBox; class Theme; +class InputEvent; +class Node; +class Texture2D; class Window : public Viewport { GDCLASS(Window, Viewport) diff --git a/scene/multiplayer/multiplayer_spawner.cpp b/scene/multiplayer/multiplayer_spawner.cpp index 4f2a9d9e8360..bc49b6d9a957 100644 --- a/scene/multiplayer/multiplayer_spawner.cpp +++ b/scene/multiplayer/multiplayer_spawner.cpp @@ -30,9 +30,13 @@ #include "multiplayer_spawner.h" -#include "core/io/marshalls.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" #include "core/multiplayer/multiplayer_api.h" -#include "scene/main/window.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/variant/array.h" #include "scene/scene_string_names.h" void MultiplayerSpawner::_bind_methods() { diff --git a/scene/multiplayer/multiplayer_spawner.h b/scene/multiplayer/multiplayer_spawner.h index 63948e39a57e..ddb5ffad4c4e 100644 --- a/scene/multiplayer/multiplayer_spawner.h +++ b/scene/multiplayer/multiplayer_spawner.h @@ -31,8 +31,19 @@ #ifndef MULTIPLAYER_SPAWNER_H #define MULTIPLAYER_SPAWNER_H +#include + #include "scene/main/node.h" +#include "core/io/resource_uid.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/set.h" #include "core/variant/typed_array.h" #include "scene/resources/packed_scene.h" #include "scene/resources/scene_replication_config.h" diff --git a/scene/multiplayer/multiplayer_synchronizer.cpp b/scene/multiplayer/multiplayer_synchronizer.cpp index fbe1b99cc969..615e5e4fe68d 100644 --- a/scene/multiplayer/multiplayer_synchronizer.cpp +++ b/scene/multiplayer/multiplayer_synchronizer.cpp @@ -31,6 +31,7 @@ #include "multiplayer_synchronizer.h" #include "core/config/engine.h" +#include "core/error/error_macros.h" #include "core/multiplayer/multiplayer_api.h" Object *MultiplayerSynchronizer::_get_prop_target(Object *p_obj, const NodePath &p_path) { diff --git a/scene/multiplayer/multiplayer_synchronizer.h b/scene/multiplayer/multiplayer_synchronizer.h index e856745379da..355c8da7478a 100644 --- a/scene/multiplayer/multiplayer_synchronizer.h +++ b/scene/multiplayer/multiplayer_synchronizer.h @@ -31,10 +31,19 @@ #ifndef MULTIPLAYER_SYNCHRONIZER_H #define MULTIPLAYER_SYNCHRONIZER_H -#include "scene/main/node.h" +#include +#include "core/error/error_list.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "scene/main/node.h" #include "scene/resources/scene_replication_config.h" +class Variant; + class MultiplayerSynchronizer : public Node { GDCLASS(MultiplayerSynchronizer, Node); diff --git a/scene/multiplayer/scene_cache_interface.cpp b/scene/multiplayer/scene_cache_interface.cpp index de4a94470aa2..159e43fbcf33 100644 --- a/scene/multiplayer/scene_cache_interface.cpp +++ b/scene/multiplayer/scene_cache_interface.cpp @@ -30,8 +30,19 @@ #include "scene_cache_interface.h" +#include "core/error/error_macros.h" #include "core/io/marshalls.h" +#include "core/multiplayer/multiplayer.h" +#include "core/multiplayer/multiplayer_peer.h" +#include "core/object/ref_counted.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" #include "scene/main/node.h" +#include "scene/main/scene_tree.h" #include "scene/main/window.h" MultiplayerCacheInterface *SceneCacheInterface::_create(MultiplayerAPI *p_multiplayer) { diff --git a/scene/multiplayer/scene_cache_interface.h b/scene/multiplayer/scene_cache_interface.h index 91a53cb948b0..c837ea760fbb 100644 --- a/scene/multiplayer/scene_cache_interface.h +++ b/scene/multiplayer/scene_cache_interface.h @@ -31,7 +31,17 @@ #ifndef SCENE_CACHE_INTERFACE_H #define SCENE_CACHE_INTERFACE_H +#include + #include "core/multiplayer/multiplayer_api.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/templates/hash_map.h" +#include "core/templates/map.h" +#include "core/typedefs.h" + +class Node; class SceneCacheInterface : public MultiplayerCacheInterface { GDCLASS(SceneCacheInterface, MultiplayerCacheInterface); diff --git a/scene/multiplayer/scene_replication_interface.cpp b/scene/multiplayer/scene_replication_interface.cpp index 2088a43ba71c..6d962da631ca 100644 --- a/scene/multiplayer/scene_replication_interface.cpp +++ b/scene/multiplayer/scene_replication_interface.cpp @@ -30,10 +30,23 @@ #include "scene_replication_interface.h" +#include "core/error/error_macros.h" #include "core/io/marshalls.h" +#include "core/multiplayer/multiplayer.h" +#include "core/multiplayer/multiplayer_peer.h" +#include "core/os/memory.h" +#include "core/os/os.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/list.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" #include "scene/main/node.h" #include "scene/multiplayer/multiplayer_spawner.h" #include "scene/multiplayer/multiplayer_synchronizer.h" +#include "scene/resources/scene_replication_config.h" #define MAKE_ROOM(m_amount) \ if (packet_cache.size() < m_amount) \ diff --git a/scene/multiplayer/scene_replication_interface.h b/scene/multiplayer/scene_replication_interface.h index 855878d029a1..45e42dabb46b 100644 --- a/scene/multiplayer/scene_replication_interface.h +++ b/scene/multiplayer/scene_replication_interface.h @@ -31,10 +31,19 @@ #ifndef SCENE_TREE_REPLICATOR_INTERFACE_H #define SCENE_TREE_REPLICATOR_INTERFACE_H -#include "core/multiplayer/multiplayer_api.h" +#include +#include "core/error/error_list.h" +#include "core/multiplayer/multiplayer_api.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/variant/variant.h" #include "scene/multiplayer/scene_replication_state.h" +class MultiplayerSpawner; +class Node; + class SceneReplicationInterface : public MultiplayerReplicationInterface { GDCLASS(SceneReplicationInterface, MultiplayerReplicationInterface); diff --git a/scene/multiplayer/scene_replication_state.cpp b/scene/multiplayer/scene_replication_state.cpp index b8dadeff24cf..4668e3757344 100644 --- a/scene/multiplayer/scene_replication_state.cpp +++ b/scene/multiplayer/scene_replication_state.cpp @@ -30,7 +30,9 @@ #include "scene/multiplayer/scene_replication_state.h" -#include "core/multiplayer/multiplayer_api.h" +#include "core/error/error_macros.h" +#include "core/object/callable_method_pointer.h" +#include "core/variant/variant.h" #include "scene/multiplayer/multiplayer_spawner.h" #include "scene/multiplayer/multiplayer_synchronizer.h" #include "scene/scene_string_names.h" diff --git a/scene/multiplayer/scene_replication_state.h b/scene/multiplayer/scene_replication_state.h index 18e4d9fa393b..b7cbba5a63cb 100644 --- a/scene/multiplayer/scene_replication_state.h +++ b/scene/multiplayer/scene_replication_state.h @@ -31,7 +31,17 @@ #ifndef SCENE_REPLICATON_STATE_H #define SCENE_REPLICATON_STATE_H +#include + +#include "core/error/error_list.h" +#include "core/object/object.h" +#include "core/object/object_id.h" #include "core/object/ref_counted.h" +#include "core/templates/hash_map.h" +#include "core/templates/set.h" +#include "scene/main/node.h" +#include "scene/multiplayer/multiplayer_spawner.h" +#include "scene/multiplayer/multiplayer_synchronizer.h" class MultiplayerSpawner; class MultiplayerSynchronizer; diff --git a/scene/multiplayer/scene_rpc_interface.cpp b/scene/multiplayer/scene_rpc_interface.cpp index 7d7f57b9a1af..5401babfad4b 100644 --- a/scene/multiplayer/scene_rpc_interface.cpp +++ b/scene/multiplayer/scene_rpc_interface.cpp @@ -31,9 +31,23 @@ #include "scene/multiplayer/scene_rpc_interface.h" #include "core/debugger/engine_debugger.h" +#include "core/error/error_list.h" +#include "core/error/error_macros.h" #include "core/io/marshalls.h" +#include "core/multiplayer/multiplayer.h" #include "core/multiplayer/multiplayer_api.h" +#include "core/multiplayer/multiplayer_peer.h" +#include "core/object/object_id.h" +#include "core/object/ref_counted.h" +#include "core/object/script_language.h" +#include "core/os/memory.h" +#include "core/string/node_path.h" +#include "core/templates/set.h" +#include "core/variant/array.h" +#include "core/variant/callable.h" +#include "core/variant/variant.h" #include "scene/main/node.h" +#include "scene/main/scene_tree.h" #include "scene/main/window.h" MultiplayerRPCInterface *SceneRPCInterface::_create(MultiplayerAPI *p_multiplayer) { diff --git a/scene/multiplayer/scene_rpc_interface.h b/scene/multiplayer/scene_rpc_interface.h index 86e1d0d28020..e9f6a768c116 100644 --- a/scene/multiplayer/scene_rpc_interface.h +++ b/scene/multiplayer/scene_rpc_interface.h @@ -31,8 +31,22 @@ #ifndef SCENE_RPC_INTERFACE_H #define SCENE_RPC_INTERFACE_H +#include + #include "core/multiplayer/multiplayer.h" #include "core/multiplayer/multiplayer_api.h" +#include "core/object/object.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" + +class Node; +class ObjectID; +class Variant; +namespace Multiplayer { +struct RPCConfig; +} // namespace Multiplayer class SceneRPCInterface : public MultiplayerRPCInterface { GDCLASS(SceneRPCInterface, MultiplayerRPCInterface); diff --git a/scene/property_utils.cpp b/scene/property_utils.cpp index a9b7e9acbe28..fb41c29a2e3b 100644 --- a/scene/property_utils.cpp +++ b/scene/property_utils.cpp @@ -31,7 +31,16 @@ #include "property_utils.h" #include "core/config/engine.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/object/script_language.h" +#include "core/string/char_utils.h" +#include "core/string/node_path.h" +#include "core/string/ustring.h" #include "core/templates/local_vector.h" +#include "scene/main/node.h" #include "scene/resources/packed_scene.h" #ifdef TOOLS_ENABLED diff --git a/scene/property_utils.h b/scene/property_utils.h index 5ada35fdd73b..80309a1d58e4 100644 --- a/scene/property_utils.h +++ b/scene/property_utils.h @@ -31,9 +31,15 @@ #ifndef PROPERTY_UTILS_H #define PROPERTY_UTILS_H +#include "core/string/string_name.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" #include "scene/main/node.h" #include "scene/resources/packed_scene.h" +class Node; +class Object; + class PropertyUtils { public: static bool is_property_value_different(const Variant &p_a, const Variant &p_b); diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 9ed83eb8c39f..65c144e9a18f 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -31,9 +31,17 @@ #include "register_scene_types.h" #include "core/config/project_settings.h" +#include "core/error/error_macros.h" +#include "core/extension/native_extension.h" #include "core/extension/native_extension_manager.h" +#include "core/io/resource_loader.h" +#include "core/io/resource_saver.h" #include "core/object/class_db.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "core/os/os.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" #include "scene/2d/animated_sprite_2d.h" #include "scene/2d/area_2d.h" #include "scene/2d/audio_listener_2d.h" @@ -42,6 +50,7 @@ #include "scene/2d/camera_2d.h" #include "scene/2d/canvas_group.h" #include "scene/2d/canvas_modulate.h" +#include "scene/2d/collision_object_2d.h" #include "scene/2d/collision_polygon_2d.h" #include "scene/2d/collision_shape_2d.h" #include "scene/2d/cpu_particles_2d.h" @@ -69,107 +78,113 @@ #include "scene/2d/tile_map.h" #include "scene/2d/touch_screen_button.h" #include "scene/2d/visible_on_screen_notifier_2d.h" +#include "scene/3d/area_3d.h" +#include "scene/3d/audio_listener_3d.h" +#include "scene/3d/audio_stream_player_3d.h" +#include "scene/3d/bone_attachment_3d.h" +#include "scene/3d/camera_3d.h" +#include "scene/3d/collision_polygon_3d.h" +#include "scene/3d/collision_shape_3d.h" +#include "scene/3d/cpu_particles_3d.h" +#include "scene/3d/decal.h" +#include "scene/3d/fog_volume.h" +#include "scene/3d/gpu_particles_3d.h" +#include "scene/3d/gpu_particles_collision_3d.h" +#include "scene/3d/importer_mesh_instance_3d.h" +#include "scene/3d/joint_3d.h" +#include "scene/3d/light_3d.h" +#include "scene/3d/lightmap_gi.h" +#include "scene/3d/lightmap_probe.h" +#include "scene/3d/multimesh_instance_3d.h" +#include "scene/3d/navigation_agent_3d.h" +#include "scene/3d/navigation_obstacle_3d.h" +#include "scene/3d/navigation_region_3d.h" +#include "scene/3d/occluder_instance_3d.h" +#include "scene/3d/path_3d.h" +#include "scene/3d/physics_body_3d.h" +#include "scene/3d/position_3d.h" +#include "scene/3d/ray_cast_3d.h" +#include "scene/3d/reflection_probe.h" +#include "scene/3d/remote_transform_3d.h" +#include "scene/3d/skeleton_ik_3d.h" +#include "scene/3d/soft_dynamic_body_3d.h" +#include "scene/3d/spring_arm_3d.h" +#include "scene/3d/sprite_3d.h" +#include "scene/3d/vehicle_body_3d.h" +#include "scene/3d/visible_on_screen_notifier_3d.h" +#include "scene/3d/visual_instance_3d.h" +#include "scene/3d/voxel_gi.h" +#include "scene/3d/world_environment.h" +#include "scene/3d/xr_nodes.h" #include "scene/animation/animation_blend_space_1d.h" #include "scene/animation/animation_blend_space_2d.h" #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_node_state_machine.h" #include "scene/animation/animation_player.h" -#include "scene/animation/animation_tree.h" #include "scene/animation/root_motion_view.h" -#include "scene/animation/tween.h" #include "scene/audio/audio_stream_player.h" #include "scene/debugger/scene_debugger.h" -#include "scene/gui/aspect_ratio_container.h" -#include "scene/gui/box_container.h" -#include "scene/gui/button.h" #include "scene/gui/center_container.h" #include "scene/gui/check_box.h" -#include "scene/gui/check_button.h" #include "scene/gui/code_edit.h" #include "scene/gui/color_picker.h" #include "scene/gui/color_rect.h" -#include "scene/gui/control.h" #include "scene/gui/dialogs.h" #include "scene/gui/file_dialog.h" #include "scene/gui/flow_container.h" #include "scene/gui/graph_edit.h" #include "scene/gui/graph_node.h" -#include "scene/gui/grid_container.h" #include "scene/gui/item_list.h" -#include "scene/gui/label.h" -#include "scene/gui/line_edit.h" #include "scene/gui/link_button.h" -#include "scene/gui/margin_container.h" #include "scene/gui/menu_button.h" #include "scene/gui/nine_patch_rect.h" #include "scene/gui/option_button.h" -#include "scene/gui/panel.h" #include "scene/gui/panel_container.h" -#include "scene/gui/popup_menu.h" #include "scene/gui/progress_bar.h" #include "scene/gui/reference_rect.h" #include "scene/gui/rich_text_effect.h" #include "scene/gui/rich_text_label.h" -#include "scene/gui/scroll_bar.h" -#include "scene/gui/scroll_container.h" -#include "scene/gui/separator.h" -#include "scene/gui/slider.h" -#include "scene/gui/spin_box.h" #include "scene/gui/split_container.h" #include "scene/gui/subviewport_container.h" #include "scene/gui/tab_bar.h" #include "scene/gui/tab_container.h" #include "scene/gui/text_edit.h" -#include "scene/gui/texture_button.h" #include "scene/gui/texture_progress_bar.h" -#include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" #include "scene/gui/video_stream_player.h" -#include "scene/main/canvas_item.h" #include "scene/main/canvas_layer.h" #include "scene/main/http_request.h" #include "scene/main/instance_placeholder.h" +#include "scene/main/node.h" #include "scene/main/resource_preloader.h" #include "scene/main/scene_tree.h" -#include "scene/main/timer.h" -#include "scene/main/viewport.h" -#include "scene/main/window.h" -#include "scene/multiplayer/multiplayer_spawner.h" -#include "scene/multiplayer/multiplayer_synchronizer.h" +#include "scene/main/shader_globals_override.h" #include "scene/multiplayer/scene_cache_interface.h" #include "scene/multiplayer/scene_replication_interface.h" #include "scene/multiplayer/scene_rpc_interface.h" #include "scene/resources/audio_stream_sample.h" -#include "scene/resources/bit_map.h" #include "scene/resources/box_shape_3d.h" -#include "scene/resources/camera_effects.h" +#include "scene/resources/canvas_item_material.h" #include "scene/resources/capsule_shape_2d.h" #include "scene/resources/capsule_shape_3d.h" #include "scene/resources/circle_shape_2d.h" -#include "scene/resources/concave_polygon_shape_2d.h" -#include "scene/resources/concave_polygon_shape_3d.h" -#include "scene/resources/convex_polygon_shape_2d.h" -#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/cylinder_shape_3d.h" #include "scene/resources/default_theme/default_theme.h" +#include "scene/resources/fog_material.h" #include "scene/resources/font.h" -#include "scene/resources/gradient.h" #include "scene/resources/height_map_shape_3d.h" -#include "scene/resources/immediate_mesh.h" +#include "scene/resources/importer_mesh.h" #include "scene/resources/material.h" -#include "scene/resources/mesh.h" #include "scene/resources/mesh_data_tool.h" -#include "scene/resources/navigation_mesh.h" -#include "scene/resources/packed_scene.h" +#include "scene/resources/mesh_library.h" #include "scene/resources/particles_material.h" -#include "scene/resources/physics_material.h" #include "scene/resources/polygon_path_finder.h" #include "scene/resources/primitive_meshes.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/separation_ray_shape_3d.h" +#include "scene/resources/shader.h" #include "scene/resources/skeleton_modification_2d.h" #include "scene/resources/skeleton_modification_2d_ccdik.h" #include "scene/resources/skeleton_modification_2d_fabrik.h" @@ -185,77 +200,438 @@ #include "scene/resources/skeleton_modification_3d_lookat.h" #include "scene/resources/skeleton_modification_3d_stackholder.h" #include "scene/resources/skeleton_modification_3d_twoboneik.h" -#include "scene/resources/skeleton_modification_stack_2d.h" #include "scene/resources/skeleton_modification_stack_3d.h" -#include "scene/resources/sky.h" #include "scene/resources/sky_material.h" #include "scene/resources/sphere_shape_3d.h" #include "scene/resources/surface_tool.h" #include "scene/resources/syntax_highlighter.h" -#include "scene/resources/text_file.h" -#include "scene/resources/text_line.h" -#include "scene/resources/text_paragraph.h" #include "scene/resources/texture.h" -#include "scene/resources/tile_set.h" -#include "scene/resources/video_stream.h" +#include "scene/resources/theme.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_3d.h" #include "scene/resources/world_boundary_shape_2d.h" #include "scene/resources/world_boundary_shape_3d.h" #include "scene/scene_string_names.h" - -#include "scene/main/shader_globals_override.h" - -#ifndef _3D_DISABLED -#include "scene/3d/area_3d.h" -#include "scene/3d/audio_listener_3d.h" -#include "scene/3d/audio_stream_player_3d.h" -#include "scene/3d/bone_attachment_3d.h" -#include "scene/3d/camera_3d.h" -#include "scene/3d/collision_polygon_3d.h" -#include "scene/3d/collision_shape_3d.h" -#include "scene/3d/cpu_particles_3d.h" -#include "scene/3d/decal.h" -#include "scene/3d/fog_volume.h" -#include "scene/3d/gpu_particles_3d.h" -#include "scene/3d/gpu_particles_collision_3d.h" -#include "scene/3d/importer_mesh_instance_3d.h" -#include "scene/3d/joint_3d.h" -#include "scene/3d/light_3d.h" -#include "scene/3d/lightmap_gi.h" -#include "scene/3d/lightmap_probe.h" -#include "scene/3d/mesh_instance_3d.h" -#include "scene/3d/multimesh_instance_3d.h" -#include "scene/3d/navigation_agent_3d.h" -#include "scene/3d/navigation_obstacle_3d.h" -#include "scene/3d/navigation_region_3d.h" -#include "scene/3d/node_3d.h" -#include "scene/3d/occluder_instance_3d.h" -#include "scene/3d/path_3d.h" -#include "scene/3d/physics_body_3d.h" -#include "scene/3d/position_3d.h" -#include "scene/3d/ray_cast_3d.h" -#include "scene/3d/reflection_probe.h" -#include "scene/3d/remote_transform_3d.h" -#include "scene/3d/skeleton_3d.h" -#include "scene/3d/skeleton_ik_3d.h" -#include "scene/3d/soft_dynamic_body_3d.h" -#include "scene/3d/spring_arm_3d.h" -#include "scene/3d/sprite_3d.h" -#include "scene/3d/vehicle_body_3d.h" -#include "scene/3d/visible_on_screen_notifier_3d.h" -#include "scene/3d/voxel_gi.h" -#include "scene/3d/world_environment.h" -#include "scene/3d/xr_nodes.h" -#include "scene/resources/environment.h" -#include "scene/resources/fog_material.h" -#include "scene/resources/importer_mesh.h" -#include "scene/resources/mesh_library.h" -#endif +#include "servers/display_server.h" +#include "servers/rendering_server.h" + +class AnimatableBody2D; +class AnimatableBody3D; +class AnimatedSprite2D; +class AnimatedSprite3D; +class Animation; +class AnimationNode; +class AnimationNodeAdd2; +class AnimationNodeAdd3; +class AnimationNodeAnimation; +class AnimationNodeBlend2; +class AnimationNodeBlend3; +class AnimationNodeBlendSpace1D; +class AnimationNodeBlendSpace2D; +class AnimationNodeBlendTree; +class AnimationNodeOneShot; +class AnimationNodeOutput; +class AnimationNodeStateMachine; +class AnimationNodeStateMachinePlayback; +class AnimationNodeStateMachineTransition; +class AnimationNodeTimeScale; +class AnimationNodeTimeSeek; +class AnimationNodeTransition; +class AnimationPlayer; +class AnimationRootNode; +class AnimationTree; +class Area2D; +class Area3D; +class ArrayMesh; +class AspectRatioContainer; +class AudioListener2D; +class AudioListener3D; +class AudioStreamPlayer2D; +class AudioStreamPlayer3D; +class AudioStreamPlayer; +class AudioStreamSample; +class BackBufferCopy; +class BaseButton; +class BitMap; +class Bone2D; +class BoneAttachment3D; +class BoxContainer; +class BoxMesh; +class BoxShape3D; +class Button; +class ButtonGroup; +class CPUParticles2D; +class CPUParticles3D; +class CallbackTweener; +class Camera2D; +class Camera3D; +class CameraEffects; +class CanvasGroup; +class CanvasItem; +class CanvasLayer; +class CanvasModulate; +class CanvasTexture; +class CapsuleMesh; +class CapsuleShape2D; +class CapsuleShape3D; +class CenterContainer; +class CharFXTransform; +class CharacterBody2D; +class CharacterBody3D; +class CheckBox; +class CheckButton; +class CircleShape2D; +class CodeEdit; +class CodeHighlighter; +class CollisionObject2D; +class CollisionObject3D; +class CollisionPolygon2D; +class CollisionPolygon3D; +class CollisionShape2D; +class CollisionShape3D; +class ColorRect; +class ConcavePolygonShape2D; +class ConcavePolygonShape3D; +class ConeTwistJoint3D; +class Container; +class Control; +class ConvexPolygonShape2D; +class ConvexPolygonShape3D; +class Curve2D; +class Curve3D; +class Curve; +class CylinderMesh; +class CylinderShape3D; +class DampedSpringJoint2D; +class Decal; +class DirectionalLight2D; +class DirectionalLight3D; +class Environment; +class FileDialog; +class FlowContainer; +class FogMaterial; +class FogVolume; +class GPUParticles2D; +class GPUParticles3D; +class GPUParticlesAttractor3D; +class GPUParticlesAttractorBox3D; +class GPUParticlesAttractorSphere3D; +class GPUParticlesAttractorVectorField3D; +class GPUParticlesCollision3D; +class GPUParticlesCollisionBox3D; +class GPUParticlesCollisionHeightField3D; +class GPUParticlesCollisionSDF3D; +class GPUParticlesCollisionSphere3D; +class Generic6DOFJoint3D; +class GeometryInstance3D; +class Gradient; +class GraphEdit; +class GraphNode; +class GridContainer; +class GrooveJoint2D; +class HBoxContainer; +class HFlowContainer; +class HScrollBar; +class HSeparator; +class HSlider; +class HSplitContainer; +class HTTPRequest; +class HeightMapShape3D; +class HingeJoint3D; +class ImmediateMesh; +class ImporterMesh; +class ImporterMeshInstance3D; +class InstancePlaceholder; +class IntervalTweener; +class ItemList; +class Joint2D; +class Joint3D; +class KinematicCollision2D; +class KinematicCollision3D; +class Label; +class Light2D; +class Light3D; +class LightOccluder2D; +class LightmapGI; +class LightmapGIData; +class LightmapProbe; +class Lightmapper; +class Line2D; +class LineEdit; +class LinkButton; +class MarginContainer; +class MenuButton; +class Mesh; +class MeshDataTool; +class MeshInstance2D; +class MeshInstance3D; +class MeshLibrary; +class MethodTweener; +class MultiMesh; +class MultiMeshInstance2D; +class MultiMeshInstance3D; +class MultiplayerSpawner; +class MultiplayerSynchronizer; +class NavigationAgent2D; +class NavigationAgent3D; +class NavigationMesh; +class NavigationObstacle2D; +class NavigationObstacle3D; +class NavigationPolygon; +class NavigationRegion2D; +class NavigationRegion3D; +class NinePatchRect; +class Node2D; +class Node3D; +class Node3DGizmo; +class Occluder3D; +class OccluderInstance3D; +class OccluderPolygon2D; +class OmniLight3D; +class OptionButton; +class PackedScene; +class Panel; +class PanelContainer; +class ParallaxBackground; +class ParallaxLayer; +class Path2D; +class Path3D; +class PathFollow2D; +class PathFollow3D; +class PhysicalBone2D; +class PhysicalBone3D; +class PhysicsBody2D; +class PhysicsBody3D; +class PhysicsMaterial; +class PinJoint2D; +class PinJoint3D; +class PlaneMesh; +class PointLight2D; +class PointMesh; +class Polygon2D; +class PolygonPathFinder; +class Popup; +class PopupMenu; +class PopupPanel; +class Position2D; +class Position3D; +class PrimitiveMesh; +class PrismMesh; +class ProgressBar; +class PropertyTweener; +class QuadMesh; +class Range; +class RayCast2D; +class RayCast3D; +class RectangleShape2D; +class ReferenceRect; +class ReflectionProbe; +class RemoteTransform2D; +class RemoteTransform3D; +class ResourcePreloader; +class RibbonTrailMesh; +class RichTextEffect; +class RichTextLabel; +class RigidDynamicBody2D; +class RigidDynamicBody3D; +class RootMotionView; +class SceneReplicationConfig; +class SceneState; +class ScrollBar; +class ScrollContainer; +class SegmentShape2D; +class SeparationRayShape2D; +class SeparationRayShape3D; +class Separator; +class ShaderGlobalsOverride; +class Shape2D; +class Shape3D; +class ShapeCast2D; +class Skeleton2D; +class Skeleton3D; +class SkeletonIK3D; +class SkeletonModification2D; +class SkeletonModification2DCCDIK; +class SkeletonModification2DFABRIK; +class SkeletonModification2DJiggle; +class SkeletonModification2DLookAt; +class SkeletonModification2DPhysicalBones; +class SkeletonModification2DStackHolder; +class SkeletonModification2DTwoBoneIK; +class SkeletonModificationStack2D; +class Skin; +class SkinReference; +class Sky; +class Slider; +class SliderJoint3D; +class SoftDynamicBody3D; +class SphereMesh; +class SphereShape3D; +class SpinBox; +class SplitContainer; +class SpotLight3D; +class SpringArm3D; +class Sprite2D; +class Sprite3D; +class SpriteBase3D; +class SpriteFrames; +class StaticBody2D; +class StaticBody3D; +class StyleBox; +class StyleBoxEmpty; +class StyleBoxFlat; +class StyleBoxLine; +class StyleBoxTexture; +class SubViewport; +class SubViewportContainer; +class SurfaceTool; +class SyntaxHighlighter; +class TabBar; +class TabContainer; +class TextEdit; +class TextLine; +class TextParagraph; +class TextureButton; +class TextureProgressBar; +class TextureRect; +class TileData; +class TileMap; +class TileMapPattern; +class TileSet; +class TileSetAtlasSource; +class TileSetScenesCollectionSource; +class TileSetSource; +class Timer; +class TouchScreenButton; +class Tree; +class TreeItem; +class TubeTrailMesh; +class Tween; +class Tweener; +class VBoxContainer; +class VFlowContainer; +class VScrollBar; +class VSeparator; +class VSlider; +class VSplitContainer; +class VehicleBody3D; +class VehicleWheel3D; +class VelocityTracker3D; +class VideoStream; +class VideoStreamPlayer; +class Viewport; +class ViewportTexture; +class VisibleOnScreenEnabler2D; +class VisibleOnScreenEnabler3D; +class VisibleOnScreenNotifier2D; +class VisibleOnScreenNotifier3D; +class VisualInstance3D; +class VisualShader; +class VisualShaderNode; +class VisualShaderNodeBillboard; +class VisualShaderNodeBooleanConstant; +class VisualShaderNodeBooleanUniform; +class VisualShaderNodeClamp; +class VisualShaderNodeColorConstant; +class VisualShaderNodeColorFunc; +class VisualShaderNodeColorOp; +class VisualShaderNodeColorUniform; +class VisualShaderNodeComment; +class VisualShaderNodeCompare; +class VisualShaderNodeConstant; +class VisualShaderNodeCubemap; +class VisualShaderNodeCubemapUniform; +class VisualShaderNodeCurveTexture; +class VisualShaderNodeCurveXYZTexture; +class VisualShaderNodeCustom; +class VisualShaderNodeDerivativeFunc; +class VisualShaderNodeDeterminant; +class VisualShaderNodeDotProduct; +class VisualShaderNodeExpression; +class VisualShaderNodeFaceForward; +class VisualShaderNodeFloatConstant; +class VisualShaderNodeFloatFunc; +class VisualShaderNodeFloatOp; +class VisualShaderNodeFloatUniform; +class VisualShaderNodeFresnel; +class VisualShaderNodeGlobalExpression; +class VisualShaderNodeGroupBase; +class VisualShaderNodeIf; +class VisualShaderNodeInput; +class VisualShaderNodeIntConstant; +class VisualShaderNodeIntFunc; +class VisualShaderNodeIntOp; +class VisualShaderNodeIntUniform; +class VisualShaderNodeIs; +class VisualShaderNodeMix; +class VisualShaderNodeMultiplyAdd; +class VisualShaderNodeOuterProduct; +class VisualShaderNodeOutput; +class VisualShaderNodeParticleAccelerator; +class VisualShaderNodeParticleBoxEmitter; +class VisualShaderNodeParticleConeVelocity; +class VisualShaderNodeParticleEmit; +class VisualShaderNodeParticleEmitter; +class VisualShaderNodeParticleMeshEmitter; +class VisualShaderNodeParticleMultiplyByAxisAngle; +class VisualShaderNodeParticleOutput; +class VisualShaderNodeParticleRandomness; +class VisualShaderNodeParticleRingEmitter; +class VisualShaderNodeParticleSphereEmitter; +class VisualShaderNodeResizableBase; +class VisualShaderNodeSDFRaymarch; +class VisualShaderNodeSDFToScreenUV; +class VisualShaderNodeSample3D; +class VisualShaderNodeScreenUVToSDF; +class VisualShaderNodeSmoothStep; +class VisualShaderNodeStep; +class VisualShaderNodeSwitch; +class VisualShaderNodeTexture2DArray; +class VisualShaderNodeTexture2DArrayUniform; +class VisualShaderNodeTexture3D; +class VisualShaderNodeTexture3DUniform; +class VisualShaderNodeTexture; +class VisualShaderNodeTextureSDF; +class VisualShaderNodeTextureSDFNormal; +class VisualShaderNodeTextureUniform; +class VisualShaderNodeTextureUniformTriplanar; +class VisualShaderNodeTransformCompose; +class VisualShaderNodeTransformConstant; +class VisualShaderNodeTransformDecompose; +class VisualShaderNodeTransformFunc; +class VisualShaderNodeTransformOp; +class VisualShaderNodeTransformUniform; +class VisualShaderNodeTransformVecMult; +class VisualShaderNodeUVFunc; +class VisualShaderNodeUniform; +class VisualShaderNodeUniformRef; +class VisualShaderNodeVec2Constant; +class VisualShaderNodeVec2Uniform; +class VisualShaderNodeVec3Constant; +class VisualShaderNodeVec3Uniform; +class VisualShaderNodeVectorBase; +class VisualShaderNodeVectorCompose; +class VisualShaderNodeVectorDecompose; +class VisualShaderNodeVectorDistance; +class VisualShaderNodeVectorFunc; +class VisualShaderNodeVectorLen; +class VisualShaderNodeVectorOp; +class VisualShaderNodeVectorRefract; +class VoxelGI; +class VoxelGIData; +class Window; +class World2D; +class World3D; +class WorldBoundaryShape2D; +class WorldBoundaryShape3D; +class WorldEnvironment; +class XRAnchor3D; +class XRCamera3D; +class XRController3D; +class XRNode3D; +class XROrigin3D; static Ref resource_saver_text; static Ref resource_loader_text; diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index b6151bccf477..ee885fa5635b 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -30,8 +30,20 @@ #include "animation.h" +#include +#include + +#include "core/error/error_macros.h" #include "core/io/marshalls.h" #include "core/math/geometry_3d.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/math/transform_2d.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/print_string.h" +#include "core/variant/array.h" +#include "core/variant/dictionary.h" #include "scene/scene_string_names.h" bool Animation::_set(const StringName &p_name, const Variant &p_value) { diff --git a/scene/resources/animation.h b/scene/resources/animation.h index f9a33da4287d..6f15a3105331 100644 --- a/scene/resources/animation.h +++ b/scene/resources/animation.h @@ -31,8 +31,27 @@ #ifndef ANIMATION_H #define ANIMATION_H +#include + +#include "core/error/error_list.h" #include "core/io/resource.h" +#include "core/math/aabb.h" +#include "core/math/math_defs.h" +#include "core/math/quaternion.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/math/vector3i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" #include "core/templates/local_vector.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #define ANIM_MIN_LENGTH 0.001 diff --git a/scene/resources/audio_stream_sample.cpp b/scene/resources/audio_stream_sample.cpp index 56786ac4b1bb..c611d0819cc4 100644 --- a/scene/resources/audio_stream_sample.cpp +++ b/scene/resources/audio_stream_sample.cpp @@ -30,8 +30,17 @@ #include "audio_stream_sample.h" +#include + +#include "core/error/error_macros.h" #include "core/io/file_access.h" #include "core/io/marshalls.h" +#include "core/math/audio_frame.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "servers/audio_server.h" void AudioStreamPlaybackSample::start(float p_from_pos) { if (base->format == AudioStreamSample::FORMAT_IMA_ADPCM) { diff --git a/scene/resources/audio_stream_sample.h b/scene/resources/audio_stream_sample.h index 043a62ff7052..7961f5f3b6a0 100644 --- a/scene/resources/audio_stream_sample.h +++ b/scene/resources/audio_stream_sample.h @@ -31,9 +31,19 @@ #ifndef AUDIO_STREAM_SAMPLE_H #define AUDIO_STREAM_SAMPLE_H +#include + +#include "core/error/error_list.h" +#include "core/io/resource.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" #include "servers/audio/audio_stream.h" class AudioStreamSample; +struct AudioFrame; class AudioStreamPlaybackSample : public AudioStreamPlayback { GDCLASS(AudioStreamPlaybackSample, AudioStreamPlayback); diff --git a/scene/resources/bit_map.cpp b/scene/resources/bit_map.cpp index c2988c2e8c1c..bc09ad7c02ce 100644 --- a/scene/resources/bit_map.cpp +++ b/scene/resources/bit_map.cpp @@ -30,7 +30,20 @@ #include "bit_map.h" -#include "core/io/image_loader.h" +#include + +#include "core/error/error_macros.h" +#include "core/io/image.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2.h" +#include "core/math/rect2i.h" +#include "core/object/class_db.h" +#include "core/string/print_string.h" +#include "core/templates/set.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" void BitMap::create(const Size2 &p_size) { ERR_FAIL_COND(p_size.width < 1); diff --git a/scene/resources/bit_map.h b/scene/resources/bit_map.h index 0d0d779c3200..0157c6885c42 100644 --- a/scene/resources/bit_map.h +++ b/scene/resources/bit_map.h @@ -31,9 +31,23 @@ #ifndef BIT_MAP_H #define BIT_MAP_H +#include + #include "core/io/image.h" #include "core/io/resource.h" #include "core/io/resource_loader.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/dictionary.h" + +class Image; +struct Rect2; +struct Rect2i; class BitMap : public Resource { GDCLASS(BitMap, Resource); diff --git a/scene/resources/box_shape_3d.cpp b/scene/resources/box_shape_3d.cpp index a1ec9a223098..5380e40179a3 100644 --- a/scene/resources/box_shape_3d.cpp +++ b/scene/resources/box_shape_3d.cpp @@ -29,6 +29,9 @@ /*************************************************************************/ #include "box_shape_3d.h" + +#include "core/math/aabb.h" +#include "core/object/class_db.h" #include "servers/physics_server_3d.h" Vector BoxShape3D::get_debug_mesh_lines() const { diff --git a/scene/resources/box_shape_3d.h b/scene/resources/box_shape_3d.h index 4e6db893af1e..388e866048f9 100644 --- a/scene/resources/box_shape_3d.h +++ b/scene/resources/box_shape_3d.h @@ -31,6 +31,12 @@ #ifndef BOX_SHAPE_H #define BOX_SHAPE_H +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/string/string_name.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" #include "scene/resources/shape_3d.h" class BoxShape3D : public Shape3D { diff --git a/scene/resources/camera_effects.cpp b/scene/resources/camera_effects.cpp index ebe2aa4dba38..d1cd22d0ed72 100644 --- a/scene/resources/camera_effects.cpp +++ b/scene/resources/camera_effects.cpp @@ -30,6 +30,9 @@ #include "camera_effects.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" #include "servers/rendering_server.h" RID CameraEffects::get_rid() const { diff --git a/scene/resources/camera_effects.h b/scene/resources/camera_effects.h index 85ae64cdf574..c0a62d879169 100644 --- a/scene/resources/camera_effects.h +++ b/scene/resources/camera_effects.h @@ -32,6 +32,7 @@ #define CAMERA_EFFECTS_H #include "core/io/resource.h" +#include "core/object/object.h" #include "core/templates/rid.h" class CameraEffects : public Resource { diff --git a/scene/resources/canvas_item_material.cpp b/scene/resources/canvas_item_material.cpp index 2d668cdf7f15..5a355bef8591 100644 --- a/scene/resources/canvas_item_material.cpp +++ b/scene/resources/canvas_item_material.cpp @@ -30,7 +30,14 @@ #include "canvas_item_material.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" #include "core/version.h" +#include "core/version_generated.gen.h" +#include "servers/rendering_server.h" Mutex CanvasItemMaterial::material_mutex; SelfList::List *CanvasItemMaterial::dirty_materials = nullptr; diff --git a/scene/resources/canvas_item_material.h b/scene/resources/canvas_item_material.h index e40e4392cb90..b548da63c560 100644 --- a/scene/resources/canvas_item_material.h +++ b/scene/resources/canvas_item_material.h @@ -31,7 +31,18 @@ #ifndef CANVAS_ITEM_MATERIAL_H #define CANVAS_ITEM_MATERIAL_H +#include + +#include "core/object/object.h" +#include "core/os/mutex.h" +#include "core/string/string_name.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" +#include "core/templates/self_list.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" #include "scene/resources/material.h" +#include "scene/resources/shader.h" class CanvasItemMaterial : public Material { GDCLASS(CanvasItemMaterial, Material); diff --git a/scene/resources/capsule_shape_2d.cpp b/scene/resources/capsule_shape_2d.cpp index 4d2698d27d92..d61d9334fb01 100644 --- a/scene/resources/capsule_shape_2d.cpp +++ b/scene/resources/capsule_shape_2d.cpp @@ -30,10 +30,17 @@ #include "capsule_shape_2d.h" +#include + #include "core/math/geometry_2d.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" #include "servers/physics_server_2d.h" #include "servers/rendering_server.h" +class RID; + Vector CapsuleShape2D::_get_points() const { Vector points; const real_t turn_step = Math_TAU / 24.0; diff --git a/scene/resources/capsule_shape_2d.h b/scene/resources/capsule_shape_2d.h index ec8b54094718..c6fa7da14925 100644 --- a/scene/resources/capsule_shape_2d.h +++ b/scene/resources/capsule_shape_2d.h @@ -31,8 +31,16 @@ #ifndef CAPSULE_SHAPE_2D_H #define CAPSULE_SHAPE_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/templates/vector.h" #include "scene/resources/shape_2d.h" +class RID; + class CapsuleShape2D : public Shape2D { GDCLASS(CapsuleShape2D, Shape2D); diff --git a/scene/resources/capsule_shape_3d.cpp b/scene/resources/capsule_shape_3d.cpp index c16ddad984d8..e44846d35316 100644 --- a/scene/resources/capsule_shape_3d.cpp +++ b/scene/resources/capsule_shape_3d.cpp @@ -29,6 +29,13 @@ /*************************************************************************/ #include "capsule_shape_3d.h" + +#include "core/math/math_funcs.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "servers/physics_server_3d.h" Vector CapsuleShape3D::get_debug_mesh_lines() const { diff --git a/scene/resources/capsule_shape_3d.h b/scene/resources/capsule_shape_3d.h index 4c039ab32656..f74b96d63607 100644 --- a/scene/resources/capsule_shape_3d.h +++ b/scene/resources/capsule_shape_3d.h @@ -31,8 +31,13 @@ #ifndef CAPSULE_SHAPE_H #define CAPSULE_SHAPE_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/templates/vector.h" #include "scene/resources/shape_3d.h" +struct Vector3; + class CapsuleShape3D : public Shape3D { GDCLASS(CapsuleShape3D, Shape3D); float radius = 0.5; diff --git a/scene/resources/circle_shape_2d.cpp b/scene/resources/circle_shape_2d.cpp index 9c16ac2eed5a..b1bc1efed81e 100644 --- a/scene/resources/circle_shape_2d.cpp +++ b/scene/resources/circle_shape_2d.cpp @@ -30,9 +30,17 @@ #include "circle_shape_2d.h" +#include + +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" #include "servers/physics_server_2d.h" #include "servers/rendering_server.h" +class RID; + bool CircleShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { return p_point.length() < get_radius() + p_tolerance; } diff --git a/scene/resources/circle_shape_2d.h b/scene/resources/circle_shape_2d.h index 62a907387f7b..8973ccaf772b 100644 --- a/scene/resources/circle_shape_2d.h +++ b/scene/resources/circle_shape_2d.h @@ -31,8 +31,15 @@ #ifndef CIRCLE_SHAPE_2D_H #define CIRCLE_SHAPE_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" #include "scene/resources/shape_2d.h" +class RID; + class CircleShape2D : public Shape2D { GDCLASS(CircleShape2D, Shape2D); diff --git a/scene/resources/concave_polygon_shape_2d.cpp b/scene/resources/concave_polygon_shape_2d.cpp index b188a6164da4..d917faa5938a 100644 --- a/scene/resources/concave_polygon_shape_2d.cpp +++ b/scene/resources/concave_polygon_shape_2d.cpp @@ -31,9 +31,15 @@ #include "concave_polygon_shape_2d.h" #include "core/math/geometry_2d.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "servers/physics_server_2d.h" #include "servers/rendering_server.h" +class RID; + bool ConcavePolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { Vector s = get_segments(); int len = s.size(); diff --git a/scene/resources/concave_polygon_shape_2d.h b/scene/resources/concave_polygon_shape_2d.h index 0f49a0d80f99..d6caf9872fe8 100644 --- a/scene/resources/concave_polygon_shape_2d.h +++ b/scene/resources/concave_polygon_shape_2d.h @@ -31,8 +31,16 @@ #ifndef CONCAVE_POLYGON_SHAPE_2D_H #define CONCAVE_POLYGON_SHAPE_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/templates/vector.h" #include "scene/resources/shape_2d.h" +class RID; + class ConcavePolygonShape2D : public Shape2D { GDCLASS(ConcavePolygonShape2D, Shape2D); diff --git a/scene/resources/concave_polygon_shape_3d.cpp b/scene/resources/concave_polygon_shape_3d.cpp index 3e178108c487..f322036f7fad 100644 --- a/scene/resources/concave_polygon_shape_3d.cpp +++ b/scene/resources/concave_polygon_shape_3d.cpp @@ -30,6 +30,12 @@ #include "concave_polygon_shape_3d.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/templates/set.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "servers/physics_server_3d.h" Vector ConcavePolygonShape3D::get_debug_mesh_lines() const { diff --git a/scene/resources/concave_polygon_shape_3d.h b/scene/resources/concave_polygon_shape_3d.h index 5337deb5fbd9..e11f95430f5b 100644 --- a/scene/resources/concave_polygon_shape_3d.h +++ b/scene/resources/concave_polygon_shape_3d.h @@ -31,6 +31,11 @@ #ifndef CONCAVE_POLYGON_SHAPE_3D_H #define CONCAVE_POLYGON_SHAPE_3D_H +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" #include "scene/resources/shape_3d.h" class ConcavePolygonShape3D : public Shape3D { diff --git a/scene/resources/convex_polygon_shape_2d.cpp b/scene/resources/convex_polygon_shape_2d.cpp index 667399ee7552..3f2846962360 100644 --- a/scene/resources/convex_polygon_shape_2d.cpp +++ b/scene/resources/convex_polygon_shape_2d.cpp @@ -30,10 +30,17 @@ #include "convex_polygon_shape_2d.h" +#include "core/error/error_macros.h" #include "core/math/geometry_2d.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "servers/physics_server_2d.h" #include "servers/rendering_server.h" +class RID; + bool ConvexPolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { return Geometry2D::is_point_in_polygon(p_point, points); } diff --git a/scene/resources/convex_polygon_shape_2d.h b/scene/resources/convex_polygon_shape_2d.h index 4896d3ec66e7..998b74ac034c 100644 --- a/scene/resources/convex_polygon_shape_2d.h +++ b/scene/resources/convex_polygon_shape_2d.h @@ -31,8 +31,16 @@ #ifndef CONVEX_POLYGON_SHAPE_2D_H #define CONVEX_POLYGON_SHAPE_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/templates/vector.h" #include "scene/resources/shape_2d.h" +class RID; + class ConvexPolygonShape2D : public Shape2D { GDCLASS(ConvexPolygonShape2D, Shape2D); diff --git a/scene/resources/convex_polygon_shape_3d.cpp b/scene/resources/convex_polygon_shape_3d.cpp index e7960f1ba447..8fa959cb4a70 100644 --- a/scene/resources/convex_polygon_shape_3d.cpp +++ b/scene/resources/convex_polygon_shape_3d.cpp @@ -29,7 +29,14 @@ /*************************************************************************/ #include "convex_polygon_shape_3d.h" + +#include "core/error/error_list.h" #include "core/math/convex_hull.h" +#include "core/math/geometry_3d.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "servers/physics_server_3d.h" Vector ConvexPolygonShape3D::get_debug_mesh_lines() const { diff --git a/scene/resources/convex_polygon_shape_3d.h b/scene/resources/convex_polygon_shape_3d.h index 930edb015dce..a68e93dc5ef7 100644 --- a/scene/resources/convex_polygon_shape_3d.h +++ b/scene/resources/convex_polygon_shape_3d.h @@ -31,6 +31,10 @@ #ifndef CONVEX_POLYGON_SHAPE_H #define CONVEX_POLYGON_SHAPE_H +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/templates/vector.h" #include "scene/resources/shape_3d.h" class ConvexPolygonShape3D : public Shape3D { diff --git a/scene/resources/curve.cpp b/scene/resources/curve.cpp index 6485c1ac77b6..c628cfa17d41 100644 --- a/scene/resources/curve.cpp +++ b/scene/resources/curve.cpp @@ -31,6 +31,14 @@ #include "curve.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/plane.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/pair.h" +#include "core/typedefs.h" template static _FORCE_INLINE_ T _bezier_interp(real_t p_t, T p_start, T p_control_1, T p_control_2, T p_end) { diff --git a/scene/resources/curve.h b/scene/resources/curve.h index 767900b84310..b02a41d025ad 100644 --- a/scene/resources/curve.h +++ b/scene/resources/curve.h @@ -32,6 +32,16 @@ #define CURVE_H #include "core/io/resource.h" +#include "core/math/math_defs.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" // y(x) curve class Curve : public Resource { diff --git a/scene/resources/cylinder_shape_3d.cpp b/scene/resources/cylinder_shape_3d.cpp index 5eeb62d17bf7..c4d23cf79d2d 100644 --- a/scene/resources/cylinder_shape_3d.cpp +++ b/scene/resources/cylinder_shape_3d.cpp @@ -29,6 +29,13 @@ /*************************************************************************/ #include "cylinder_shape_3d.h" + +#include "core/math/math_funcs.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "servers/physics_server_3d.h" Vector CylinderShape3D::get_debug_mesh_lines() const { diff --git a/scene/resources/cylinder_shape_3d.h b/scene/resources/cylinder_shape_3d.h index 65427423c899..d9354e0dab3d 100644 --- a/scene/resources/cylinder_shape_3d.h +++ b/scene/resources/cylinder_shape_3d.h @@ -31,8 +31,13 @@ #ifndef CYLINDER_SHAPE_3D_H #define CYLINDER_SHAPE_3D_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/templates/vector.h" #include "scene/resources/shape_3d.h" +struct Vector3; + class CylinderShape3D : public Shape3D { GDCLASS(CylinderShape3D, Shape3D); float radius = 0.5; diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 670b141080c1..9b4a32c810fc 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -30,14 +30,21 @@ #include "default_theme.h" -#include "core/os/os.h" +#include "core/io/image.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/os/memory.h" +#include "core/typedefs.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "default_font.gen.h" #include "default_theme_icons.gen.h" +#include "modules/modules_enabled.gen.h" // For svg. #include "scene/resources/font.h" +#include "scene/resources/style_box.h" +#include "scene/resources/texture.h" #include "scene/resources/theme.h" -#include "servers/text_server.h" - -#include "modules/modules_enabled.gen.h" // For svg. #ifdef MODULE_SVG_ENABLED #include "modules/svg/image_loader_svg.h" #endif diff --git a/scene/resources/default_theme/default_theme.h b/scene/resources/default_theme/default_theme.h index 3016517824ad..b0db8f1db8a2 100644 --- a/scene/resources/default_theme/default_theme.h +++ b/scene/resources/default_theme/default_theme.h @@ -31,8 +31,14 @@ #ifndef DEFAULT_THEME_H #define DEFAULT_THEME_H +#include "core/object/ref_counted.h" #include "scene/resources/theme.h" +class Font; +class StyleBox; +class Texture2D; +class Theme; + const int default_font_size = 16; void fill_default_theme(Ref &theme, const Ref &default_font, Ref &default_icon, Ref &default_style, float p_scale); diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp index b13ae9d0162e..79a5eb1653f3 100644 --- a/scene/resources/environment.cpp +++ b/scene/resources/environment.cpp @@ -30,8 +30,14 @@ #include "environment.h" -#include "core/config/project_settings.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "scene/resources/sky.h" #include "servers/rendering_server.h" #include "texture.h" diff --git a/scene/resources/environment.h b/scene/resources/environment.h index b04723a2216e..ae6f7cd6736e 100644 --- a/scene/resources/environment.h +++ b/scene/resources/environment.h @@ -32,10 +32,22 @@ #define ENVIRONMENT_H #include "core/io/resource.h" +#include "core/math/color.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/resources/sky.h" #include "scene/resources/texture.h" #include "servers/rendering_server.h" +class Sky; +class Texture; + class Environment : public Resource { GDCLASS(Environment, Resource); diff --git a/scene/resources/fog_material.cpp b/scene/resources/fog_material.cpp index a05ef0c779ff..7ed6a034fd53 100644 --- a/scene/resources/fog_material.cpp +++ b/scene/resources/fog_material.cpp @@ -30,7 +30,13 @@ #include "fog_material.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "core/version.h" +#include "core/version_generated.gen.h" +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" Mutex FogMaterial::shader_mutex; RID FogMaterial::shader; diff --git a/scene/resources/fog_material.h b/scene/resources/fog_material.h index 1f7cd7bfe6da..582ed8f44bbd 100644 --- a/scene/resources/fog_material.h +++ b/scene/resources/fog_material.h @@ -31,7 +31,15 @@ #ifndef FOG_MATERIAL_H #define FOG_MATERIAL_H +#include "core/math/color.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/mutex.h" +#include "core/templates/rid.h" #include "scene/resources/material.h" +#include "scene/resources/shader.h" + +class Texture3D; class FogMaterial : public Material { GDCLASS(FogMaterial, Material); diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp index b512acdd8a12..4fa5f58c767c 100644 --- a/scene/resources/font.cpp +++ b/scene/resources/font.cpp @@ -30,12 +30,24 @@ #include "font.h" +#include + +#include "core/error/error_macros.h" +#include "core/io/file_access.h" +#include "core/io/image.h" #include "core/io/image_loader.h" -#include "core/io/resource_loader.h" +#include "core/math/vector2i.h" +#include "core/math/vector3.h" +#include "core/math/vector3i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" #include "core/string/translation.h" #include "core/templates/hashfuncs.h" +#include "core/templates/map.h" #include "scene/resources/text_line.h" #include "scene/resources/text_paragraph.h" +#include "servers/rendering_server.h" _FORCE_INLINE_ void FontData::_clear_cache() { for (int i = 0; i < cache.size(); i++) { diff --git a/scene/resources/font.h b/scene/resources/font.h index 93351a34935e..69db019c6e95 100644 --- a/scene/resources/font.h +++ b/scene/resources/font.h @@ -31,12 +31,34 @@ #ifndef FONT_H #define FONT_H +#include +#include + +#include "core/error/error_list.h" #include "core/io/resource.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" #include "core/templates/lru.h" #include "core/templates/map.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/resources/texture.h" #include "servers/text_server.h" +class Image; +struct Vector2i; + /*************************************************************************/ class FontData : public Resource { diff --git a/scene/resources/gradient.cpp b/scene/resources/gradient.cpp index 79ac1b57c341..b16fae6214fa 100644 --- a/scene/resources/gradient.cpp +++ b/scene/resources/gradient.cpp @@ -31,6 +31,8 @@ #include "gradient.h" #include "core/core_string_names.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" Gradient::Gradient() { //Set initial gradient transition from black to white diff --git a/scene/resources/gradient.h b/scene/resources/gradient.h index c2085b3a13c0..5f2f42643f87 100644 --- a/scene/resources/gradient.h +++ b/scene/resources/gradient.h @@ -31,7 +31,14 @@ #ifndef GRADIENT_H #define GRADIENT_H +#include "core/error/error_macros.h" #include "core/io/resource.h" +#include "core/math/color.h" +#include "core/object/object.h" +#include "core/string/ustring.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" class Gradient : public Resource { GDCLASS(Gradient, Resource); diff --git a/scene/resources/height_map_shape_3d.cpp b/scene/resources/height_map_shape_3d.cpp index 121930d86f70..9f403a59162c 100644 --- a/scene/resources/height_map_shape_3d.cpp +++ b/scene/resources/height_map_shape_3d.cpp @@ -29,6 +29,12 @@ /*************************************************************************/ #include "height_map_shape_3d.h" + +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "servers/physics_server_3d.h" Vector HeightMapShape3D::get_debug_mesh_lines() const { diff --git a/scene/resources/height_map_shape_3d.h b/scene/resources/height_map_shape_3d.h index 79d1b1567470..936483fe502c 100644 --- a/scene/resources/height_map_shape_3d.h +++ b/scene/resources/height_map_shape_3d.h @@ -31,8 +31,13 @@ #ifndef HEIGHT_MAP_SHAPE_H #define HEIGHT_MAP_SHAPE_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/templates/vector.h" #include "scene/resources/shape_3d.h" +struct Vector3; + class HeightMapShape3D : public Shape3D { GDCLASS(HeightMapShape3D, Shape3D); diff --git a/scene/resources/immediate_mesh.cpp b/scene/resources/immediate_mesh.cpp index 28afef86383c..e14a518f7bf7 100644 --- a/scene/resources/immediate_mesh.cpp +++ b/scene/resources/immediate_mesh.cpp @@ -30,6 +30,11 @@ #include "immediate_mesh.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "servers/rendering_server.h" + void ImmediateMesh::surface_begin(PrimitiveType p_primitive, const Ref &p_material) { ERR_FAIL_COND_MSG(surface_active, "Already creating a new surface."); active_surface_data.primitive = p_primitive; diff --git a/scene/resources/immediate_mesh.h b/scene/resources/immediate_mesh.h index e5f627ae8e9e..cf2cdc01c894 100644 --- a/scene/resources/immediate_mesh.h +++ b/scene/resources/immediate_mesh.h @@ -31,7 +31,23 @@ #ifndef IMMEDIATE_MESH_H #define IMMEDIATE_MESH_H +#include + +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/plane.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" #include "core/templates/local_vector.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/dictionary.h" +#include "scene/resources/material.h" #include "scene/resources/mesh.h" class ImmediateMesh : public Mesh { diff --git a/scene/resources/importer_mesh.cpp b/scene/resources/importer_mesh.cpp index 92ab091b86b9..391f64fe3d3a 100644 --- a/scene/resources/importer_mesh.cpp +++ b/scene/resources/importer_mesh.cpp @@ -30,11 +30,35 @@ #include "importer_mesh.h" +#include +#include +#include + +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/color.h" +#include "core/math/face3.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/plane.h" #include "core/math/random_pcg.h" #include "core/math/static_raycaster.h" +#include "core/math/transform_3d.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/print_string.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/pair.h" +#include "core/variant/variant.h" +#include "scene/resources/concave_polygon_shape_3d.h" +#include "scene/resources/convex_polygon_shape_3d.h" +#include "scene/resources/navigation_mesh.h" +#include "scene/resources/shape_3d.h" #include "scene/resources/surface_tool.h" - -#include +#include "servers/rendering_server.h" void ImporterMesh::Surface::split_normals(const LocalVector &p_indices, const LocalVector &p_normals) { _split_normals(arrays, p_indices, p_normals); diff --git a/scene/resources/importer_mesh.h b/scene/resources/importer_mesh.h index 8f77597a58a5..1b0f93b6f10f 100644 --- a/scene/resources/importer_mesh.h +++ b/scene/resources/importer_mesh.h @@ -31,14 +31,30 @@ #ifndef SCENE_IMPORTER_MESH_H #define SCENE_IMPORTER_MESH_H +#include + +#include "core/error/error_list.h" #include "core/io/resource.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" #include "core/templates/local_vector.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/dictionary.h" #include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/convex_polygon_shape_3d.h" +#include "scene/resources/material.h" #include "scene/resources/mesh.h" #include "scene/resources/navigation_mesh.h" -#include +class NavigationMesh; +class Shape3D; +struct Face3; +struct Transform3D; +struct Vector3; // The following classes are used by importers instead of ArrayMesh and MeshInstance3D // so the data is not registered (hence, quality loss), importing happens faster and diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index f3e5ece1f9ac..f3cd53a69193 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -31,9 +31,21 @@ #include "material.h" #include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/plane.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/object/method_bind.h" +#include "core/os/main_loop.h" +#include "core/os/memory.h" +#include "core/os/os.h" +#include "core/templates/pair.h" #include "core/version.h" +#include "core/version_generated.gen.h" #include "scene/main/scene_tree.h" -#include "scene/scene_string_names.h" +#include "scene/resources/texture.h" void Material::set_next_pass(const Ref &p_pass) { for (Ref pass_child = p_pass; pass_child != nullptr; pass_child = pass_child->get_next_pass()) { diff --git a/scene/resources/material.h b/scene/resources/material.h index 57591bee2f0e..ca7f34456063 100644 --- a/scene/resources/material.h +++ b/scene/resources/material.h @@ -31,12 +31,30 @@ #ifndef MATERIAL_H #define MATERIAL_H +#include +#include + #include "core/io/resource.h" +#include "core/math/color.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/mutex.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" #include "core/templates/self_list.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/resources/shader.h" #include "scene/resources/texture.h" #include "servers/rendering_server.h" +class Texture2D; + class Material : public Resource { GDCLASS(Material, Resource); RES_BASE_EXTENSION("material") diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index 441e84ecccc0..8190cf53c835 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -30,14 +30,29 @@ #include "mesh.h" +#include + +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/color.h" #include "core/math/convex_hull.h" +#include "core/math/face3.h" +#include "core/math/geometry_3d.h" +#include "core/math/math_funcs.h" +#include "core/math/plane.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/object/method_bind.h" +#include "core/os/memory.h" +#include "core/string/print_string.h" +#include "core/templates/local_vector.h" +#include "core/templates/map.h" #include "core/templates/pair.h" #include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/convex_polygon_shape_3d.h" +#include "scene/resources/shape_3d.h" #include "surface_tool.h" -#include - Mesh::ConvexDecompositionFunc Mesh::convex_decomposition_function = nullptr; Ref Mesh::generate_triangle_mesh() const { diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index 08d834bdb955..75f70cbe4a99 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -31,13 +31,36 @@ #ifndef MESH_H #define MESH_H +#include + +#include "core/error/error_list.h" #include "core/io/resource.h" +#include "core/math/aabb.h" #include "core/math/face3.h" +#include "core/math/math_defs.h" +#include "core/math/transform_3d.h" #include "core/math/triangle_mesh.h" +#include "core/math/vector2i.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/resources/material.h" #include "scene/resources/shape_3d.h" #include "servers/rendering_server.h" +class Shape3D; +struct Face3; + class Mesh : public Resource { GDCLASS(Mesh, Resource); diff --git a/scene/resources/mesh_data_tool.cpp b/scene/resources/mesh_data_tool.cpp index 594f723a1dc6..e07609e08354 100644 --- a/scene/resources/mesh_data_tool.cpp +++ b/scene/resources/mesh_data_tool.cpp @@ -30,6 +30,15 @@ #include "mesh_data_tool.h" +#include "core/error/error_macros.h" +#include "core/math/math_defs.h" +#include "core/math/vector2i.h" +#include "core/object/class_db.h" +#include "core/templates/map.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "scene/resources/mesh.h" + void MeshDataTool::clear() { vertices.clear(); edges.clear(); diff --git a/scene/resources/mesh_data_tool.h b/scene/resources/mesh_data_tool.h index ff27d78c290b..25baf726fd08 100644 --- a/scene/resources/mesh_data_tool.h +++ b/scene/resources/mesh_data_tool.h @@ -31,8 +31,20 @@ #ifndef MESH_DATA_TOOL_H #define MESH_DATA_TOOL_H +#include "core/error/error_list.h" +#include "core/math/color.h" +#include "core/math/plane.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" +#include "scene/resources/material.h" #include "scene/resources/mesh.h" +class ArrayMesh; + class MeshDataTool : public RefCounted { GDCLASS(MeshDataTool, RefCounted); diff --git a/scene/resources/mesh_library.cpp b/scene/resources/mesh_library.cpp index 5168bf83eb87..076280b75c37 100644 --- a/scene/resources/mesh_library.cpp +++ b/scene/resources/mesh_library.cpp @@ -31,6 +31,12 @@ #include "mesh_library.h" #include "box_shape_3d.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/templates/pair.h" +#include "core/typedefs.h" +#include "scene/resources/mesh.h" +#include "scene/resources/shape_3d.h" bool MeshLibrary::_set(const StringName &p_name, const Variant &p_value) { String name = p_name; diff --git a/scene/resources/mesh_library.h b/scene/resources/mesh_library.h index e0f2ab2114e2..28b6c85ecd29 100644 --- a/scene/resources/mesh_library.h +++ b/scene/resources/mesh_library.h @@ -32,9 +32,20 @@ #define MESH_LIBRARY_H #include "core/io/resource.h" +#include "core/math/transform_3d.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" #include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" #include "mesh.h" #include "scene/3d/navigation_region_3d.h" +#include "scene/resources/navigation_mesh.h" +#include "scene/resources/texture.h" #include "shape_3d.h" class MeshLibrary : public Resource { diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp index c30e748f66b6..17fa550a1e0a 100644 --- a/scene/resources/multimesh.cpp +++ b/scene/resources/multimesh.cpp @@ -30,6 +30,13 @@ #include "multimesh.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/resources/mesh.h" #include "servers/rendering_server.h" #ifndef DISABLE_DEPRECATED diff --git a/scene/resources/multimesh.h b/scene/resources/multimesh.h index 30ada5365f1d..d0d9fcc6cc79 100644 --- a/scene/resources/multimesh.h +++ b/scene/resources/multimesh.h @@ -31,9 +31,24 @@ #ifndef MULTIMESH_H #define MULTIMESH_H +#include "core/io/resource.h" +#include "core/math/aabb.h" +#include "core/math/color.h" +#include "core/math/transform_2d.h" +#include "core/math/transform_3d.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" #include "scene/resources/mesh.h" #include "servers/rendering_server.h" +class Mesh; +struct Vector2; +struct Vector3; + class MultiMesh : public Resource { GDCLASS(MultiMesh, Resource); RES_BASE_EXTENSION("multimesh"); diff --git a/scene/resources/navigation_mesh.cpp b/scene/resources/navigation_mesh.cpp index 47a87bdea57d..b70038cda430 100644 --- a/scene/resources/navigation_mesh.cpp +++ b/scene/resources/navigation_mesh.cpp @@ -30,6 +30,18 @@ #include "navigation_mesh.h" +#include "core/error/error_macros.h" +#include "core/math/face3.h" +#include "core/math/math_defs.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/pair.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" + void NavigationMesh::create_from_mesh(const Ref &p_mesh) { ERR_FAIL_COND(p_mesh.is_null()); diff --git a/scene/resources/navigation_mesh.h b/scene/resources/navigation_mesh.h index e43e8627e41b..44b618044eeb 100644 --- a/scene/resources/navigation_mesh.h +++ b/scene/resources/navigation_mesh.h @@ -31,6 +31,16 @@ #ifndef NAVIGATION_MESH_H #define NAVIGATION_MESH_H +#include + +#include "core/io/resource.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" #include "scene/resources/mesh.h" class Mesh; diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index f9a4eba978d9..c3ebca5c4d78 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -31,14 +31,23 @@ #include "packed_scene.h" #include "core/config/engine.h" -#include "core/config/project_settings.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" #include "core/io/resource_loader.h" -#include "editor/editor_inspector.h" +#include "core/object/class_db.h" +#include "core/object/script_language.h" +#include "core/os/memory.h" +#include "core/templates/list.h" +#include "core/templates/pair.h" +#include "core/templates/set.h" +#include "core/typedefs.h" +#include "core/variant/callable.h" +#include "core/variant/callable_bind.h" #include "scene/2d/node_2d.h" #include "scene/3d/node_3d.h" #include "scene/gui/control.h" #include "scene/main/instance_placeholder.h" +#include "scene/main/node.h" #include "scene/property_utils.h" #define PACKED_SCENE_VERSION 2 diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h index 81b38840d9c8..73d17ed7ed82 100644 --- a/scene/resources/packed_scene.h +++ b/scene/resources/packed_scene.h @@ -31,9 +31,27 @@ #ifndef PACKED_SCENE_H #define PACKED_SCENE_H +#include + +#include "core/error/error_list.h" #include "core/io/resource.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/main/node.h" +class Node; +class PackedScene; + class SceneState : public RefCounted { GDCLASS(SceneState, RefCounted); diff --git a/scene/resources/particles_material.cpp b/scene/resources/particles_material.cpp index 1ef2b3496f6b..1dfa88255c84 100644 --- a/scene/resources/particles_material.cpp +++ b/scene/resources/particles_material.cpp @@ -30,7 +30,15 @@ #include "particles_material.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" #include "core/version.h" +#include "core/version_generated.gen.h" +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" Mutex ParticlesMaterial::material_mutex; SelfList::List *ParticlesMaterial::dirty_materials = nullptr; diff --git a/scene/resources/particles_material.h b/scene/resources/particles_material.h index fd00c584686a..d6d0d5979acb 100644 --- a/scene/resources/particles_material.h +++ b/scene/resources/particles_material.h @@ -28,8 +28,24 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include + +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/mutex.h" +#include "core/string/string_name.h" +#include "core/templates/map.h" #include "core/templates/rid.h" +#include "core/templates/self_list.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" #include "scene/resources/material.h" +#include "scene/resources/shader.h" + +class Texture2D; #ifndef PARTICLES_MATERIAL_H #define PARTICLES_MATERIAL_H diff --git a/scene/resources/physics_material.cpp b/scene/resources/physics_material.cpp index c1b868cb9738..7806075ab4c9 100644 --- a/scene/resources/physics_material.cpp +++ b/scene/resources/physics_material.cpp @@ -30,6 +30,9 @@ #include "physics_material.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" + void PhysicsMaterial::_bind_methods() { ClassDB::bind_method(D_METHOD("set_friction", "friction"), &PhysicsMaterial::set_friction); ClassDB::bind_method(D_METHOD("get_friction"), &PhysicsMaterial::get_friction); diff --git a/scene/resources/physics_material.h b/scene/resources/physics_material.h index f352e6618987..a766e9ed88e8 100644 --- a/scene/resources/physics_material.h +++ b/scene/resources/physics_material.h @@ -32,6 +32,10 @@ #define PHYSICS_MATERIAL_H #include "core/io/resource.h" +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" #include "servers/physics_server_3d.h" class PhysicsMaterial : public Resource { diff --git a/scene/resources/polygon_path_finder.cpp b/scene/resources/polygon_path_finder.cpp index 882afdb43ddc..a56a1be44caf 100644 --- a/scene/resources/polygon_path_finder.cpp +++ b/scene/resources/polygon_path_finder.cpp @@ -29,7 +29,16 @@ /*************************************************************************/ #include "polygon_path_finder.h" + +#include + +#include "core/error/error_macros.h" #include "core/math/geometry_2d.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" bool PolygonPathFinder::_is_point_inside(const Vector2 &p_point) const { int crosses = 0; diff --git a/scene/resources/polygon_path_finder.h b/scene/resources/polygon_path_finder.h index db9619291734..72d12926a9c9 100644 --- a/scene/resources/polygon_path_finder.h +++ b/scene/resources/polygon_path_finder.h @@ -32,6 +32,13 @@ #define POLYGON_PATH_FINDER_H #include "core/io/resource.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/dictionary.h" class PolygonPathFinder : public Resource { GDCLASS(PolygonPathFinder, Resource); diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index 38acd0af0ae0..58e28bf788a5 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -29,6 +29,17 @@ /*************************************************************************/ #include "primitive_meshes.h" + +#include + +#include "core/error/error_macros.h" +#include "core/math/math_defs.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/resources/material.h" #include "servers/rendering_server.h" /** diff --git a/scene/resources/primitive_meshes.h b/scene/resources/primitive_meshes.h index 3fc5fd4a1696..88b0c98fa9be 100644 --- a/scene/resources/primitive_meshes.h +++ b/scene/resources/primitive_meshes.h @@ -31,8 +31,24 @@ #ifndef PRIMITIVE_MESHES_H #define PRIMITIVE_MESHES_H +#include + +#include "core/math/aabb.h" +#include "core/math/transform_3d.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/rid.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "scene/resources/curve.h" #include "scene/resources/mesh.h" +class Material; + ///@TODO probably should change a few integers to unsigned integers... /** diff --git a/scene/resources/rectangle_shape_2d.cpp b/scene/resources/rectangle_shape_2d.cpp index 27659f724ed7..ab2aaf8fbe87 100644 --- a/scene/resources/rectangle_shape_2d.cpp +++ b/scene/resources/rectangle_shape_2d.cpp @@ -30,8 +30,13 @@ #include "rectangle_shape_2d.h" +#include "core/object/class_db.h" +#include "core/templates/vector.h" #include "servers/physics_server_2d.h" #include "servers/rendering_server.h" + +class RID; + void RectangleShape2D::_update_shape() { PhysicsServer2D::get_singleton()->shape_set_data(get_rid(), size * 0.5); emit_changed(); diff --git a/scene/resources/rectangle_shape_2d.h b/scene/resources/rectangle_shape_2d.h index fa85aef428fb..ac2da6c3604f 100644 --- a/scene/resources/rectangle_shape_2d.h +++ b/scene/resources/rectangle_shape_2d.h @@ -31,8 +31,17 @@ #ifndef RECTANGLE_SHAPE_2D_H #define RECTANGLE_SHAPE_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/string/string_name.h" +#include "core/variant/variant.h" #include "scene/resources/shape_2d.h" +class RID; + class RectangleShape2D : public Shape2D { GDCLASS(RectangleShape2D, Shape2D); diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp index 6bb710b1d974..c7eb0d10d42b 100644 --- a/scene/resources/resource_format_text.cpp +++ b/scene/resources/resource_format_text.cpp @@ -31,17 +31,26 @@ #include "resource_format_text.h" #include "core/config/project_settings.h" +#include "core/error/error_macros.h" #include "core/io/dir_access.h" +#include "core/io/file_access.h" #include "core/io/resource_format_binary.h" -#include "core/version.h" +#include "core/object/class_db.h" +#include "core/object/object.h" +#include "core/os/memory.h" +#include "core/string/node_path.h" +#include "core/string/print_string.h" +#include "core/templates/pair.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/dictionary.h" +#include "core/version_generated.gen.h" // Version 2: changed names for Basis, AABB, Vectors, etc. // Version 3: new string ID for ext/subresources, breaks forward compat. #define FORMAT_VERSION 3 -#include "core/io/dir_access.h" -#include "core/version.h" - #define _printerr() ERR_PRINT(String(res_path + ":" + itos(lines) + " - Parse Error: " + error_text).utf8().get_data()); /// diff --git a/scene/resources/resource_format_text.h b/scene/resources/resource_format_text.h index 9585b9040f45..e796e244147b 100644 --- a/scene/resources/resource_format_text.h +++ b/scene/resources/resource_format_text.h @@ -31,12 +31,26 @@ #ifndef RESOURCE_FORMAT_TEXT_H #define RESOURCE_FORMAT_TEXT_H +#include + +#include "core/error/error_list.h" #include "core/io/file_access.h" +#include "core/io/resource.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" +#include "core/io/resource_uid.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/set.h" +#include "core/variant/variant.h" #include "core/variant/variant_parser.h" #include "scene/resources/packed_scene.h" +class FileAccess; + class ResourceLoaderText { bool translation_remapped = false; String local_path; diff --git a/scene/resources/scene_replication_config.cpp b/scene/resources/scene_replication_config.cpp index 2acc0f19221d..fa3c31c885cb 100644 --- a/scene/resources/scene_replication_config.cpp +++ b/scene/resources/scene_replication_config.cpp @@ -30,8 +30,8 @@ #include "scene_replication_config.h" -#include "core/multiplayer/multiplayer_api.h" -#include "scene/main/node.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" bool SceneReplicationConfig::_set(const StringName &p_name, const Variant &p_value) { String name = p_name; diff --git a/scene/resources/scene_replication_config.h b/scene/resources/scene_replication_config.h index b791be94145d..846e2dd69c61 100644 --- a/scene/resources/scene_replication_config.h +++ b/scene/resources/scene_replication_config.h @@ -32,8 +32,13 @@ #define SCENE_REPLICATION_CONFIG_H #include "core/io/resource.h" - +#include "core/object/object.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" #include "core/variant/typed_array.h" +#include "core/variant/variant.h" class SceneReplicationConfig : public Resource { GDCLASS(SceneReplicationConfig, Resource); diff --git a/scene/resources/segment_shape_2d.cpp b/scene/resources/segment_shape_2d.cpp index cea8ca1b2973..e1b8e88de2bf 100644 --- a/scene/resources/segment_shape_2d.cpp +++ b/scene/resources/segment_shape_2d.cpp @@ -31,9 +31,13 @@ #include "segment_shape_2d.h" #include "core/math/geometry_2d.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" #include "servers/physics_server_2d.h" #include "servers/rendering_server.h" +class RID; + bool SegmentShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { Vector2 l[2] = { a, b }; Vector2 closest = Geometry2D::get_closest_point_to_segment(p_point, l); diff --git a/scene/resources/segment_shape_2d.h b/scene/resources/segment_shape_2d.h index 6ade0618e3d2..dddcc74674b8 100644 --- a/scene/resources/segment_shape_2d.h +++ b/scene/resources/segment_shape_2d.h @@ -31,8 +31,15 @@ #ifndef SEGMENT_SHAPE_2D_H #define SEGMENT_SHAPE_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" #include "scene/resources/shape_2d.h" +class RID; + class SegmentShape2D : public Shape2D { GDCLASS(SegmentShape2D, Shape2D); diff --git a/scene/resources/separation_ray_shape_2d.cpp b/scene/resources/separation_ray_shape_2d.cpp index 0406c91b704f..50ff46b2dbac 100644 --- a/scene/resources/separation_ray_shape_2d.cpp +++ b/scene/resources/separation_ray_shape_2d.cpp @@ -30,6 +30,16 @@ #include "separation_ray_shape_2d.h" +#include + +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "servers/physics_server_2d.h" #include "servers/rendering_server.h" diff --git a/scene/resources/separation_ray_shape_2d.h b/scene/resources/separation_ray_shape_2d.h index 7c35d53133fc..b8011703236b 100644 --- a/scene/resources/separation_ray_shape_2d.h +++ b/scene/resources/separation_ray_shape_2d.h @@ -31,8 +31,14 @@ #ifndef SEPARATION_RAY_SHAPE_2D_H #define SEPARATION_RAY_SHAPE_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/object/object.h" #include "scene/resources/shape_2d.h" +class RID; + class SeparationRayShape2D : public Shape2D { GDCLASS(SeparationRayShape2D, Shape2D); diff --git a/scene/resources/separation_ray_shape_3d.cpp b/scene/resources/separation_ray_shape_3d.cpp index 5aa761658936..cc15e5c82c04 100644 --- a/scene/resources/separation_ray_shape_3d.cpp +++ b/scene/resources/separation_ray_shape_3d.cpp @@ -30,6 +30,12 @@ #include "separation_ray_shape_3d.h" +#include + +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "servers/physics_server_3d.h" Vector SeparationRayShape3D::get_debug_mesh_lines() const { diff --git a/scene/resources/separation_ray_shape_3d.h b/scene/resources/separation_ray_shape_3d.h index 0e750a48e6c5..7723866ab5d1 100644 --- a/scene/resources/separation_ray_shape_3d.h +++ b/scene/resources/separation_ray_shape_3d.h @@ -30,8 +30,13 @@ #ifndef SEPARATION_RAY_SHAPE_H #define SEPARATION_RAY_SHAPE_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/templates/vector.h" #include "scene/resources/shape_3d.h" +struct Vector3; + class SeparationRayShape3D : public Shape3D { GDCLASS(SeparationRayShape3D, Shape3D); float length = 1.0; diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index ce7fcb199d74..1f8503a6053b 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -30,8 +30,13 @@ #include "shader.h" +#include "core/error/error_macros.h" #include "core/io/file_access.h" -#include "scene/scene_string_names.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" +#include "core/templates/pair.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" #include "servers/rendering/shader_language.h" #include "servers/rendering_server.h" #include "texture.h" diff --git a/scene/resources/shader.h b/scene/resources/shader.h index d05ec068195f..d23834e0e883 100644 --- a/scene/resources/shader.h +++ b/scene/resources/shader.h @@ -31,9 +31,21 @@ #ifndef SHADER_H #define SHADER_H +#include + +#include "core/error/error_list.h" #include "core/io/resource.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/rid.h" +#include "core/typedefs.h" +#include "core/variant/binder_common.h" #include "scene/resources/texture.h" class Shader : public Resource { diff --git a/scene/resources/shape_2d.cpp b/scene/resources/shape_2d.cpp index 16ef45829fd1..d2a74ec3c8b3 100644 --- a/scene/resources/shape_2d.cpp +++ b/scene/resources/shape_2d.cpp @@ -32,8 +32,13 @@ #include "core/config/engine.h" #include "core/config/project_settings.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" #include "servers/physics_server_2d.h" +struct Transform2D; + RID Shape2D::get_rid() const { return shape; } diff --git a/scene/resources/shape_2d.h b/scene/resources/shape_2d.h index e9dc10eeae3e..97e02194d963 100644 --- a/scene/resources/shape_2d.h +++ b/scene/resources/shape_2d.h @@ -32,6 +32,17 @@ #define SHAPE_2D_H #include "core/io/resource.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/variant/array.h" + +struct Transform2D; class Shape2D : public Resource { GDCLASS(Shape2D, Resource); diff --git a/scene/resources/shape_3d.cpp b/scene/resources/shape_3d.cpp index ffb2b276446c..26834815a75f 100644 --- a/scene/resources/shape_3d.cpp +++ b/scene/resources/shape_3d.cpp @@ -30,7 +30,15 @@ #include "shape_3d.h" +#include "core/error/error_macros.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/os/main_loop.h" +#include "core/os/memory.h" #include "core/os/os.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" #include "scene/main/scene_tree.h" #include "scene/resources/mesh.h" #include "servers/physics_server_3d.h" diff --git a/scene/resources/shape_3d.h b/scene/resources/shape_3d.h index 77e79a269dc8..e8792b060f28 100644 --- a/scene/resources/shape_3d.h +++ b/scene/resources/shape_3d.h @@ -32,8 +32,17 @@ #define SHAPE_3D_H #include "core/io/resource.h" +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" class ArrayMesh; +struct Transform3D; +struct Vector3; class Shape3D : public Resource { GDCLASS(Shape3D, Resource); diff --git a/scene/resources/skeleton_modification_2d.cpp b/scene/resources/skeleton_modification_2d.cpp index 885cf0f1b856..725a80411643 100644 --- a/scene/resources/skeleton_modification_2d.cpp +++ b/scene/resources/skeleton_modification_2d.cpp @@ -29,11 +29,19 @@ /*************************************************************************/ #include "skeleton_modification_2d.h" -#include "scene/2d/skeleton_2d.h" -#include "scene/2d/collision_object_2d.h" -#include "scene/2d/collision_shape_2d.h" -#include "scene/2d/physical_bone_2d.h" +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/2d/skeleton_2d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_2d.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/scene/resources/skeleton_modification_2d.h b/scene/resources/skeleton_modification_2d.h index d49f9e7f51ce..9633628fe7f0 100644 --- a/scene/resources/skeleton_modification_2d.h +++ b/scene/resources/skeleton_modification_2d.h @@ -31,6 +31,12 @@ #ifndef SKELETONMODIFICATION2D_H #define SKELETONMODIFICATION2D_H +#include "core/io/resource.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "scene/2d/skeleton_2d.h" #include "scene/resources/skeleton_modification_stack_2d.h" diff --git a/scene/resources/skeleton_modification_2d_ccdik.cpp b/scene/resources/skeleton_modification_2d_ccdik.cpp index 7adaf1452c1d..920d0d6d5a8e 100644 --- a/scene/resources/skeleton_modification_2d_ccdik.cpp +++ b/scene/resources/skeleton_modification_2d_ccdik.cpp @@ -29,11 +29,18 @@ /*************************************************************************/ #include "skeleton_modification_2d_ccdik.h" -#include "scene/2d/skeleton_2d.h" -#ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" -#endif // TOOLS_ENABLED +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "scene/2d/node_2d.h" +#include "scene/2d/skeleton_2d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_2d.h" bool SkeletonModification2DCCDIK::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_2d_ccdik.h b/scene/resources/skeleton_modification_2d_ccdik.h index 31485fa31fa1..2f73c37ed420 100644 --- a/scene/resources/skeleton_modification_2d_ccdik.h +++ b/scene/resources/skeleton_modification_2d_ccdik.h @@ -31,9 +31,20 @@ #ifndef SKELETONMODIFICATION2DCCDIK_H #define SKELETONMODIFICATION2DCCDIK_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" #include "scene/2d/skeleton_2d.h" #include "scene/resources/skeleton_modification_2d.h" +class Node2D; +class SkeletonModificationStack2D; + /////////////////////////////////////// // SkeletonModification2DCCDIK /////////////////////////////////////// diff --git a/scene/resources/skeleton_modification_2d_fabrik.cpp b/scene/resources/skeleton_modification_2d_fabrik.cpp index 393d404e9b56..1261a4193843 100644 --- a/scene/resources/skeleton_modification_2d_fabrik.cpp +++ b/scene/resources/skeleton_modification_2d_fabrik.cpp @@ -29,11 +29,16 @@ /*************************************************************************/ #include "skeleton_modification_2d_fabrik.h" -#include "scene/2d/skeleton_2d.h" -#ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" -#endif // TOOLS_ENABLED +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "scene/2d/node_2d.h" +#include "scene/2d/skeleton_2d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_2d.h" bool SkeletonModification2DFABRIK::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_2d_fabrik.h b/scene/resources/skeleton_modification_2d_fabrik.h index d5077084ef65..e055997ffb99 100644 --- a/scene/resources/skeleton_modification_2d_fabrik.h +++ b/scene/resources/skeleton_modification_2d_fabrik.h @@ -31,9 +31,20 @@ #ifndef SKELETONMODIFICATION2DFABRIK_H #define SKELETONMODIFICATION2DFABRIK_H +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" #include "scene/2d/skeleton_2d.h" #include "scene/resources/skeleton_modification_2d.h" +class SkeletonModificationStack2D; + /////////////////////////////////////// // SkeletonModification2DFABRIK /////////////////////////////////////// diff --git a/scene/resources/skeleton_modification_2d_jiggle.cpp b/scene/resources/skeleton_modification_2d_jiggle.cpp index eee6067dae41..73534086f3f1 100644 --- a/scene/resources/skeleton_modification_2d_jiggle.cpp +++ b/scene/resources/skeleton_modification_2d_jiggle.cpp @@ -29,7 +29,18 @@ /*************************************************************************/ #include "skeleton_modification_2d_jiggle.h" + +#include "core/error/error_macros.h" +#include "core/math/transform_2d.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "scene/2d/node_2d.h" #include "scene/2d/skeleton_2d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_2d.h" +#include "scene/resources/world_2d.h" +#include "servers/physics_server_2d.h" bool SkeletonModification2DJiggle::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_2d_jiggle.h b/scene/resources/skeleton_modification_2d_jiggle.h index a1abca656452..f0e7afb780cb 100644 --- a/scene/resources/skeleton_modification_2d_jiggle.h +++ b/scene/resources/skeleton_modification_2d_jiggle.h @@ -31,9 +31,22 @@ #ifndef SKELETONMODIFICATION2DJIGGLE_H #define SKELETONMODIFICATION2DJIGGLE_H +#include + +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" #include "scene/2d/skeleton_2d.h" #include "scene/resources/skeleton_modification_2d.h" +class Node2D; +class SkeletonModificationStack2D; + /////////////////////////////////////// // SkeletonModification2DJIGGLE /////////////////////////////////////// diff --git a/scene/resources/skeleton_modification_2d_lookat.cpp b/scene/resources/skeleton_modification_2d_lookat.cpp index 23e1c579dc25..8eaef2e43679 100644 --- a/scene/resources/skeleton_modification_2d_lookat.cpp +++ b/scene/resources/skeleton_modification_2d_lookat.cpp @@ -29,11 +29,17 @@ /*************************************************************************/ #include "skeleton_modification_2d_lookat.h" -#include "scene/2d/skeleton_2d.h" -#ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" -#endif // TOOLS_ENABLED +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_2d.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "scene/2d/node_2d.h" +#include "scene/2d/skeleton_2d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_2d.h" bool SkeletonModification2DLookAt::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_2d_lookat.h b/scene/resources/skeleton_modification_2d_lookat.h index ff91b92e7d85..c96680cfeaef 100644 --- a/scene/resources/skeleton_modification_2d_lookat.h +++ b/scene/resources/skeleton_modification_2d_lookat.h @@ -31,9 +31,19 @@ #ifndef SKELETONMODIFICATION2DLOOKAT_H #define SKELETONMODIFICATION2DLOOKAT_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/variant/variant.h" #include "scene/2d/skeleton_2d.h" #include "scene/resources/skeleton_modification_2d.h" +class Node2D; +class SkeletonModificationStack2D; + /////////////////////////////////////// // SkeletonModification2DLookAt /////////////////////////////////////// diff --git a/scene/resources/skeleton_modification_2d_physicalbones.cpp b/scene/resources/skeleton_modification_2d_physicalbones.cpp index ddfd1d06b370..58a6d4a41467 100644 --- a/scene/resources/skeleton_modification_2d_physicalbones.cpp +++ b/scene/resources/skeleton_modification_2d_physicalbones.cpp @@ -29,8 +29,16 @@ /*************************************************************************/ #include "skeleton_modification_2d_physicalbones.h" + +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/variant/array.h" #include "scene/2d/physical_bone_2d.h" #include "scene/2d/skeleton_2d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_2d.h" bool SkeletonModification2DPhysicalBones::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_2d_physicalbones.h b/scene/resources/skeleton_modification_2d_physicalbones.h index d53102fa5eac..78193246cc33 100644 --- a/scene/resources/skeleton_modification_2d_physicalbones.h +++ b/scene/resources/skeleton_modification_2d_physicalbones.h @@ -31,9 +31,19 @@ #ifndef SKELETONMODIFICATION2DPHYSICALBONES_H #define SKELETONMODIFICATION2DPHYSICALBONES_H +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/2d/skeleton_2d.h" #include "scene/resources/skeleton_modification_2d.h" +class SkeletonModificationStack2D; + /////////////////////////////////////// // SkeletonModification2DJIGGLE /////////////////////////////////////// diff --git a/scene/resources/skeleton_modification_2d_stackholder.cpp b/scene/resources/skeleton_modification_2d_stackholder.cpp index 9ec343470443..7e7489ee0856 100644 --- a/scene/resources/skeleton_modification_2d_stackholder.cpp +++ b/scene/resources/skeleton_modification_2d_stackholder.cpp @@ -29,7 +29,12 @@ /*************************************************************************/ #include "skeleton_modification_2d_stackholder.h" -#include "scene/2d/skeleton_2d.h" + +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "scene/resources/skeleton_modification_stack_2d.h" bool SkeletonModification2DStackHolder::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_2d_stackholder.h b/scene/resources/skeleton_modification_2d_stackholder.h index 99d9f6f381a6..451963a67e73 100644 --- a/scene/resources/skeleton_modification_2d_stackholder.h +++ b/scene/resources/skeleton_modification_2d_stackholder.h @@ -31,9 +31,16 @@ #ifndef SKELETONMODIFICATION2DSTACKHOLDER_H #define SKELETONMODIFICATION2DSTACKHOLDER_H +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/variant/variant.h" #include "scene/2d/skeleton_2d.h" #include "scene/resources/skeleton_modification_2d.h" +class SkeletonModificationStack2D; + /////////////////////////////////////// // SkeletonModification2DJIGGLE /////////////////////////////////////// diff --git a/scene/resources/skeleton_modification_2d_twoboneik.cpp b/scene/resources/skeleton_modification_2d_twoboneik.cpp index b08fd82381c4..498f5af95cdd 100644 --- a/scene/resources/skeleton_modification_2d_twoboneik.cpp +++ b/scene/resources/skeleton_modification_2d_twoboneik.cpp @@ -29,7 +29,22 @@ /*************************************************************************/ #include "skeleton_modification_2d_twoboneik.h" + +#include + +#include "core/config/engine.h" +#include "core/error/error_macros.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "core/typedefs.h" +#include "scene/2d/node_2d.h" #include "scene/2d/skeleton_2d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_2d.h" #ifdef TOOLS_ENABLED #include "editor/editor_settings.h" diff --git a/scene/resources/skeleton_modification_2d_twoboneik.h b/scene/resources/skeleton_modification_2d_twoboneik.h index fc14d35f7037..f8f6c84d0be9 100644 --- a/scene/resources/skeleton_modification_2d_twoboneik.h +++ b/scene/resources/skeleton_modification_2d_twoboneik.h @@ -31,9 +31,17 @@ #ifndef SKELETONMODIFICATION2DTWOBONEIK_H #define SKELETONMODIFICATION2DTWOBONEIK_H +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/variant/variant.h" #include "scene/2d/skeleton_2d.h" #include "scene/resources/skeleton_modification_2d.h" +class SkeletonModificationStack2D; + /////////////////////////////////////// // SkeletonModification2DJIGGLE /////////////////////////////////////// diff --git a/scene/resources/skeleton_modification_3d.cpp b/scene/resources/skeleton_modification_3d.cpp index 2c0f6e779e3b..ff9318d34e10 100644 --- a/scene/resources/skeleton_modification_3d.cpp +++ b/scene/resources/skeleton_modification_3d.cpp @@ -29,7 +29,14 @@ /*************************************************************************/ #include "skeleton_modification_3d.h" -#include "scene/3d/skeleton_3d.h" + +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" +#include "scene/resources/skeleton_modification_stack_3d.h" void SkeletonModification3D::_execute(real_t p_delta) { GDVIRTUAL_CALL(_execute, p_delta); diff --git a/scene/resources/skeleton_modification_3d.h b/scene/resources/skeleton_modification_3d.h index a81c0c38bd26..81f2c191fb91 100644 --- a/scene/resources/skeleton_modification_3d.h +++ b/scene/resources/skeleton_modification_3d.h @@ -31,6 +31,13 @@ #ifndef SKELETONMODIFICATION3D_H #define SKELETONMODIFICATION3D_H +#include "core/io/resource.h" +#include "core/math/math_defs.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" #include "scene/3d/skeleton_3d.h" #include "scene/resources/skeleton_modification_stack_3d.h" diff --git a/scene/resources/skeleton_modification_3d_ccdik.cpp b/scene/resources/skeleton_modification_3d_ccdik.cpp index f19be47db25f..925945b3c780 100644 --- a/scene/resources/skeleton_modification_3d_ccdik.cpp +++ b/scene/resources/skeleton_modification_3d_ccdik.cpp @@ -29,8 +29,20 @@ /*************************************************************************/ #include "scene/resources/skeleton_modification_3d_ccdik.h" + +#include + +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "scene/3d/node_3d.h" #include "scene/3d/skeleton_3d.h" -#include "scene/resources/skeleton_modification_3d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_3d.h" bool SkeletonModification3DCCDIK::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_3d_ccdik.h b/scene/resources/skeleton_modification_3d_ccdik.h index 873ab8aa5a58..6d195c3c5ba5 100644 --- a/scene/resources/skeleton_modification_3d_ccdik.h +++ b/scene/resources/skeleton_modification_3d_ccdik.h @@ -28,10 +28,21 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" #include "core/templates/local_vector.h" +#include "core/variant/variant.h" #include "scene/3d/skeleton_3d.h" #include "scene/resources/skeleton_modification_3d.h" +class Node3D; +class SkeletonModificationStack3D; + #ifndef SKELETONMODIFICATION3DCCDIK_H #define SKELETONMODIFICATION3DCCDIK_H diff --git a/scene/resources/skeleton_modification_3d_fabrik.cpp b/scene/resources/skeleton_modification_3d_fabrik.cpp index b62dda3f4fa4..10af86900830 100644 --- a/scene/resources/skeleton_modification_3d_fabrik.cpp +++ b/scene/resources/skeleton_modification_3d_fabrik.cpp @@ -29,8 +29,18 @@ /*************************************************************************/ #include "scene/resources/skeleton_modification_3d_fabrik.h" + +#include + +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/templates/vector.h" +#include "scene/3d/node_3d.h" #include "scene/3d/skeleton_3d.h" -#include "scene/resources/skeleton_modification_3d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_3d.h" bool SkeletonModification3DFABRIK::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_3d_fabrik.h b/scene/resources/skeleton_modification_3d_fabrik.h index cc4d3a5e2012..52de7841c21e 100644 --- a/scene/resources/skeleton_modification_3d_fabrik.h +++ b/scene/resources/skeleton_modification_3d_fabrik.h @@ -28,10 +28,22 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "core/math/math_defs.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" #include "core/templates/local_vector.h" +#include "core/variant/variant.h" #include "scene/3d/skeleton_3d.h" #include "scene/resources/skeleton_modification_3d.h" +class SkeletonModificationStack3D; + #ifndef SKELETONMODIFICATION3DFABRIK_H #define SKELETONMODIFICATION3DFABRIK_H diff --git a/scene/resources/skeleton_modification_3d_jiggle.cpp b/scene/resources/skeleton_modification_3d_jiggle.cpp index 3e36c241f78c..dc346f5ad3af 100644 --- a/scene/resources/skeleton_modification_3d_jiggle.cpp +++ b/scene/resources/skeleton_modification_3d_jiggle.cpp @@ -29,8 +29,20 @@ /*************************************************************************/ #include "scene/resources/skeleton_modification_3d_jiggle.h" + +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_3d.h" +#include "core/object/class_db.h" +#include "core/object/ref_counted.h" +#include "core/templates/vector.h" +#include "scene/3d/node_3d.h" #include "scene/3d/skeleton_3d.h" -#include "scene/resources/skeleton_modification_3d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_3d.h" +#include "scene/resources/world_3d.h" +#include "servers/physics_server_3d.h" bool SkeletonModification3DJiggle::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_3d_jiggle.h b/scene/resources/skeleton_modification_3d_jiggle.h index 7ec5ed4f11f2..42900b0e0639 100644 --- a/scene/resources/skeleton_modification_3d_jiggle.h +++ b/scene/resources/skeleton_modification_3d_jiggle.h @@ -28,10 +28,24 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include + +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" #include "core/templates/local_vector.h" +#include "core/variant/variant.h" #include "scene/3d/skeleton_3d.h" #include "scene/resources/skeleton_modification_3d.h" +class Node3D; +class SkeletonModificationStack3D; + #ifndef SKELETONMODIFICATION3DJIGGLE_H #define SKELETONMODIFICATION3DJIGGLE_H diff --git a/scene/resources/skeleton_modification_3d_lookat.cpp b/scene/resources/skeleton_modification_3d_lookat.cpp index 3e8c1e3a7729..9581e05d3d35 100644 --- a/scene/resources/skeleton_modification_3d_lookat.cpp +++ b/scene/resources/skeleton_modification_3d_lookat.cpp @@ -29,8 +29,16 @@ /*************************************************************************/ #include "scene/resources/skeleton_modification_3d_lookat.h" + +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_3d.h" +#include "core/object/class_db.h" +#include "scene/3d/node_3d.h" #include "scene/3d/skeleton_3d.h" -#include "scene/resources/skeleton_modification_3d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_3d.h" bool SkeletonModification3DLookAt::_set(const StringName &p_path, const Variant &p_value) { if (p_path == "lock_rotation_to_plane") { diff --git a/scene/resources/skeleton_modification_3d_lookat.h b/scene/resources/skeleton_modification_3d_lookat.h index 9f5120a0fd79..13f95d5c8426 100644 --- a/scene/resources/skeleton_modification_3d_lookat.h +++ b/scene/resources/skeleton_modification_3d_lookat.h @@ -28,9 +28,20 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "core/math/math_defs.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/variant/variant.h" #include "scene/3d/skeleton_3d.h" #include "scene/resources/skeleton_modification_3d.h" +class SkeletonModificationStack3D; + #ifndef SKELETONMODIFICATION3DLOOKAT_H #define SKELETONMODIFICATION3DLOOKAT_H diff --git a/scene/resources/skeleton_modification_3d_stackholder.cpp b/scene/resources/skeleton_modification_3d_stackholder.cpp index fb2e80d21742..cc9400e7bd88 100644 --- a/scene/resources/skeleton_modification_3d_stackholder.cpp +++ b/scene/resources/skeleton_modification_3d_stackholder.cpp @@ -29,8 +29,11 @@ /*************************************************************************/ #include "scene/resources/skeleton_modification_3d_stackholder.h" -#include "scene/3d/skeleton_3d.h" -#include "scene/resources/skeleton_modification_3d.h" + +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" +#include "scene/resources/skeleton_modification_stack_3d.h" bool SkeletonModification3DStackHolder::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_3d_stackholder.h b/scene/resources/skeleton_modification_3d_stackholder.h index 5780d7d43f68..dfc8ca58f3f3 100644 --- a/scene/resources/skeleton_modification_3d_stackholder.h +++ b/scene/resources/skeleton_modification_3d_stackholder.h @@ -28,9 +28,17 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/variant/variant.h" #include "scene/3d/skeleton_3d.h" #include "scene/resources/skeleton_modification_3d.h" +class SkeletonModificationStack3D; + #ifndef SKELETONMODIFICATION3DSTACKHOLDER_H #define SKELETONMODIFICATION3DSTACKHOLDER_H diff --git a/scene/resources/skeleton_modification_3d_twoboneik.cpp b/scene/resources/skeleton_modification_3d_twoboneik.cpp index acc5ff716ce3..b09343162db6 100644 --- a/scene/resources/skeleton_modification_3d_twoboneik.cpp +++ b/scene/resources/skeleton_modification_3d_twoboneik.cpp @@ -29,8 +29,20 @@ /*************************************************************************/ #include "scene/resources/skeleton_modification_3d_twoboneik.h" + +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/math_funcs.h" +#include "core/math/quaternion.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "scene/3d/node_3d.h" #include "scene/3d/skeleton_3d.h" -#include "scene/resources/skeleton_modification_3d.h" +#include "scene/main/node.h" +#include "scene/resources/skeleton_modification_stack_3d.h" bool SkeletonModification3DTwoBoneIK::_set(const StringName &p_path, const Variant &p_value) { String path = p_path; diff --git a/scene/resources/skeleton_modification_3d_twoboneik.h b/scene/resources/skeleton_modification_3d_twoboneik.h index a4ddc6cee7cf..833ee3898dc3 100644 --- a/scene/resources/skeleton_modification_3d_twoboneik.h +++ b/scene/resources/skeleton_modification_3d_twoboneik.h @@ -28,9 +28,19 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/object_id.h" +#include "core/string/node_path.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/variant/variant.h" #include "scene/3d/skeleton_3d.h" #include "scene/resources/skeleton_modification_3d.h" +class SkeletonModificationStack3D; + #ifndef SKELETONMODIFICATION3DTWOBONEIK_H #define SKELETONMODIFICATION3DTWOBONEIK_H diff --git a/scene/resources/skeleton_modification_stack_2d.cpp b/scene/resources/skeleton_modification_stack_2d.cpp index b944c244b658..4ec5d16b0d35 100644 --- a/scene/resources/skeleton_modification_stack_2d.cpp +++ b/scene/resources/skeleton_modification_stack_2d.cpp @@ -29,7 +29,13 @@ /*************************************************************************/ #include "skeleton_modification_stack_2d.h" + +#include "core/error/error_macros.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" #include "scene/2d/skeleton_2d.h" +#include "scene/resources/skeleton_modification_2d.h" void SkeletonModificationStack2D::_get_property_list(List *p_list) const { for (int i = 0; i < modifications.size(); i++) { diff --git a/scene/resources/skeleton_modification_stack_2d.h b/scene/resources/skeleton_modification_stack_2d.h index 7b5f8e032265..4e0f411634f3 100644 --- a/scene/resources/skeleton_modification_stack_2d.h +++ b/scene/resources/skeleton_modification_stack_2d.h @@ -31,6 +31,13 @@ #ifndef SKELETONMODIFICATIONSTACK2D_H #define SKELETONMODIFICATIONSTACK2D_H +#include "core/io/resource.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" #include "scene/2d/skeleton_2d.h" #include "scene/resources/skeleton_modification_2d.h" diff --git a/scene/resources/skeleton_modification_stack_3d.cpp b/scene/resources/skeleton_modification_stack_3d.cpp index 7ccba1228c29..72dceb8a9889 100644 --- a/scene/resources/skeleton_modification_stack_3d.cpp +++ b/scene/resources/skeleton_modification_stack_3d.cpp @@ -29,7 +29,14 @@ /*************************************************************************/ #include "skeleton_modification_stack_3d.h" + +#include + +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/string/ustring.h" #include "scene/3d/skeleton_3d.h" +#include "scene/resources/skeleton_modification_3d.h" /////////////////////////////////////// // ModificationStack3D diff --git a/scene/resources/skeleton_modification_stack_3d.h b/scene/resources/skeleton_modification_stack_3d.h index 2c17fba2c526..35528e326f8d 100644 --- a/scene/resources/skeleton_modification_stack_3d.h +++ b/scene/resources/skeleton_modification_stack_3d.h @@ -31,7 +31,14 @@ #ifndef SKELETONMODIFICATIONSTACK3D_H #define SKELETONMODIFICATIONSTACK3D_H +#include "core/io/resource.h" +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" #include "core/templates/local_vector.h" +#include "core/variant/variant.h" #include "scene/3d/skeleton_3d.h" class Skeleton3D; diff --git a/scene/resources/skin.cpp b/scene/resources/skin.cpp index 54ed71999c4e..67ae404b7687 100644 --- a/scene/resources/skin.cpp +++ b/scene/resources/skin.cpp @@ -30,6 +30,10 @@ #include "skin.h" +#include + +#include "core/object/class_db.h" + void Skin::set_bind_count(int p_size) { ERR_FAIL_COND(p_size < 0); binds.resize(p_size); diff --git a/scene/resources/skin.h b/scene/resources/skin.h index 6ade9dbed15b..c947a449b9df 100644 --- a/scene/resources/skin.h +++ b/scene/resources/skin.h @@ -31,7 +31,15 @@ #ifndef SKIN_H #define SKIN_H +#include "core/error/error_macros.h" #include "core/io/resource.h" +#include "core/math/transform_3d.h" +#include "core/object/object.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/variant.h" class Skin : public Resource { GDCLASS(Skin, Resource) diff --git a/scene/resources/sky.cpp b/scene/resources/sky.cpp index 9cb6a16f5c43..9246a8dd5043 100644 --- a/scene/resources/sky.cpp +++ b/scene/resources/sky.cpp @@ -30,7 +30,11 @@ #include "sky.h" -#include "core/io/image_loader.h" +#include "core/error/error_macros.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/resources/material.h" +#include "servers/rendering_server.h" void Sky::set_radiance_size(RadianceSize p_size) { ERR_FAIL_INDEX(p_size, RADIANCE_SIZE_MAX); diff --git a/scene/resources/sky.h b/scene/resources/sky.h index 5e522390322e..fc275879496c 100644 --- a/scene/resources/sky.h +++ b/scene/resources/sky.h @@ -31,10 +31,17 @@ #ifndef SKY_H #define SKY_H +#include "core/io/resource.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "core/os/thread.h" +#include "core/templates/rid.h" +#include "core/variant/binder_common.h" #include "scene/resources/material.h" #include "scene/resources/texture.h" +class Material; + class Sky : public Resource { GDCLASS(Sky, Resource); diff --git a/scene/resources/sky_material.cpp b/scene/resources/sky_material.cpp index c5d5ba2912fa..661e90882df4 100644 --- a/scene/resources/sky_material.cpp +++ b/scene/resources/sky_material.cpp @@ -30,7 +30,13 @@ #include "sky_material.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" #include "core/version.h" +#include "core/version_generated.gen.h" +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" Mutex ProceduralSkyMaterial::shader_mutex; RID ProceduralSkyMaterial::shader; diff --git a/scene/resources/sky_material.h b/scene/resources/sky_material.h index 7f421beb8d34..55c72ba3cee2 100644 --- a/scene/resources/sky_material.h +++ b/scene/resources/sky_material.h @@ -28,8 +28,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "core/math/color.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/os/mutex.h" #include "core/templates/rid.h" #include "scene/resources/material.h" +#include "scene/resources/shader.h" + +class Texture2D; #ifndef SKY_MATERIAL_H #define SKY_MATERIAL_H diff --git a/scene/resources/sphere_shape_3d.cpp b/scene/resources/sphere_shape_3d.cpp index ee789362c9ef..7bad651647dd 100644 --- a/scene/resources/sphere_shape_3d.cpp +++ b/scene/resources/sphere_shape_3d.cpp @@ -29,6 +29,12 @@ /*************************************************************************/ #include "sphere_shape_3d.h" + +#include "core/math/math_funcs.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" #include "servers/physics_server_3d.h" Vector SphereShape3D::get_debug_mesh_lines() const { diff --git a/scene/resources/sphere_shape_3d.h b/scene/resources/sphere_shape_3d.h index ff6d883940f0..3dc65cb54b04 100644 --- a/scene/resources/sphere_shape_3d.h +++ b/scene/resources/sphere_shape_3d.h @@ -31,8 +31,13 @@ #ifndef SPHERE_SHAPE_3D_H #define SPHERE_SHAPE_3D_H +#include "core/math/math_defs.h" +#include "core/object/object.h" +#include "core/templates/vector.h" #include "scene/resources/shape_3d.h" +struct Vector3; + class SphereShape3D : public Shape3D { GDCLASS(SphereShape3D, Shape3D); float radius; diff --git a/scene/resources/sprite_frames.cpp b/scene/resources/sprite_frames.cpp index ece126791e51..eb7b9f82fa3e 100644 --- a/scene/resources/sprite_frames.cpp +++ b/scene/resources/sprite_frames.cpp @@ -30,6 +30,10 @@ #include "sprite_frames.h" +#include "core/object/class_db.h" +#include "core/templates/pair.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/scene_string_names.h" void SpriteFrames::add_frame(const StringName &p_anim, const Ref &p_frame, int p_at_pos) { diff --git a/scene/resources/sprite_frames.h b/scene/resources/sprite_frames.h index 12b69afde136..828aea7ec895 100644 --- a/scene/resources/sprite_frames.h +++ b/scene/resources/sprite_frames.h @@ -31,6 +31,17 @@ #ifndef SPRITE_FRAMES_H #define SPRITE_FRAMES_H +#include "core/error/error_macros.h" +#include "core/io/resource.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" #include "scene/resources/texture.h" class SpriteFrames : public Resource { diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp index 5afd424e039c..3fb5410707ed 100644 --- a/scene/resources/style_box.cpp +++ b/scene/resources/style_box.cpp @@ -30,9 +30,20 @@ #include "style_box.h" +#include +#include + +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/math/rect2i.h" +#include "core/math/vector2i.h" +#include "core/object/class_db.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "scene/main/canvas_item.h" - -#include +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" bool StyleBox::test_mask(const Point2 &p_point, const Rect2 &p_rect) const { return true; diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index 4c41f42293dc..968bb9570357 100644 --- a/scene/resources/style_box.h +++ b/scene/resources/style_box.h @@ -32,10 +32,20 @@ #define STYLE_BOX_H #include "core/io/resource.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/variant/binder_common.h" #include "scene/resources/texture.h" #include "servers/rendering_server.h" class CanvasItem; +class Texture2D; class StyleBox : public Resource { GDCLASS(StyleBox, Resource); diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index 0677d9c1a889..82dd8d230dd3 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -30,6 +30,21 @@ #include "surface_tool.h" +#include + +#include "core/error/error_macros.h" +#include "core/math/aabb.h" +#include "core/math/basis.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_3d.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/templates/hash_map.h" +#include "core/templates/hashfuncs.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" + #define EQ_VERTEX_DIST 0.00001 SurfaceTool::OptimizeVertexCacheFunc SurfaceTool::optimize_vertex_cache_func = nullptr; diff --git a/scene/resources/surface_tool.h b/scene/resources/surface_tool.h index 9cb83e0e683e..bbeda7a1bfc7 100644 --- a/scene/resources/surface_tool.h +++ b/scene/resources/surface_tool.h @@ -31,10 +31,28 @@ #ifndef SURFACE_TOOL_H #define SURFACE_TOOL_H +#include +#include + +#include "core/math/color.h" +#include "core/math/plane.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" #include "core/templates/local_vector.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "scene/resources/material.h" #include "scene/resources/mesh.h" +#include "servers/rendering_server.h" #include "thirdparty/misc/mikktspace.h" +struct Transform3D; + class SurfaceTool : public RefCounted { GDCLASS(SurfaceTool, RefCounted); diff --git a/scene/resources/syntax_highlighter.cpp b/scene/resources/syntax_highlighter.cpp index f1eddd8ffc3f..203da14157af 100644 --- a/scene/resources/syntax_highlighter.cpp +++ b/scene/resources/syntax_highlighter.cpp @@ -30,7 +30,13 @@ #include "syntax_highlighter.h" -#include "core/object/script_language.h" +#include "core/error/error_macros.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/char_utils.h" +#include "core/templates/list.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" #include "scene/gui/text_edit.h" Dictionary SyntaxHighlighter::get_line_syntax_highlighting(int p_line) { diff --git a/scene/resources/syntax_highlighter.h b/scene/resources/syntax_highlighter.h index 143f1679c60f..cf73e2a71662 100644 --- a/scene/resources/syntax_highlighter.h +++ b/scene/resources/syntax_highlighter.h @@ -32,8 +32,16 @@ #define SYNTAX_HIGHLIGHTER_H #include "core/io/resource.h" +#include "core/math/color.h" #include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/object_id.h" #include "core/object/script_language.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/dictionary.h" class TextEdit; diff --git a/scene/resources/text_file.cpp b/scene/resources/text_file.cpp index cbfee754e220..97b4e0866de7 100644 --- a/scene/resources/text_file.cpp +++ b/scene/resources/text_file.cpp @@ -30,7 +30,12 @@ #include "text_file.h" +#include + +#include "core/error/error_macros.h" #include "core/io/file_access.h" +#include "core/os/memory.h" +#include "core/templates/vector.h" bool TextFile::has_text() const { return !text.is_empty(); diff --git a/scene/resources/text_file.h b/scene/resources/text_file.h index 0c8cf855f072..658ce8818120 100644 --- a/scene/resources/text_file.h +++ b/scene/resources/text_file.h @@ -31,8 +31,12 @@ #ifndef TEXTFILE_H #define TEXTFILE_H +#include "core/error/error_list.h" +#include "core/io/resource.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" +#include "core/object/object.h" +#include "core/string/ustring.h" class TextFile : public Resource { GDCLASS(TextFile, Resource); diff --git a/scene/resources/text_line.cpp b/scene/resources/text_line.cpp index c3b5bd3564dd..4b1b304afee9 100644 --- a/scene/resources/text_line.cpp +++ b/scene/resources/text_line.cpp @@ -30,6 +30,12 @@ #include "text_line.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "scene/resources/font.h" + void TextLine::_bind_methods() { ClassDB::bind_method(D_METHOD("clear"), &TextLine::clear); diff --git a/scene/resources/text_line.h b/scene/resources/text_line.h index c5762db0f2eb..ed7b07086a70 100644 --- a/scene/resources/text_line.h +++ b/scene/resources/text_line.h @@ -31,9 +31,26 @@ #ifndef TEXT_LINE_H #define TEXT_LINE_H +#include + +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/resources/font.h" #include "servers/text_server.h" +class Font; + /*************************************************************************/ class TextLine : public RefCounted { diff --git a/scene/resources/text_paragraph.cpp b/scene/resources/text_paragraph.cpp index 4d75874199f5..ee4fd404191c 100644 --- a/scene/resources/text_paragraph.cpp +++ b/scene/resources/text_paragraph.cpp @@ -30,6 +30,12 @@ #include "scene/resources/text_paragraph.h" +#include "core/error/error_macros.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/typedefs.h" +#include "scene/resources/font.h" + void TextParagraph::_bind_methods() { ClassDB::bind_method(D_METHOD("clear"), &TextParagraph::clear); diff --git a/scene/resources/text_paragraph.h b/scene/resources/text_paragraph.h index 8a8a53943bd6..b91acfa36c7d 100644 --- a/scene/resources/text_paragraph.h +++ b/scene/resources/text_paragraph.h @@ -31,9 +31,27 @@ #ifndef TEXT_PARAGRAPH_H #define TEXT_PARAGRAPH_H +#include + +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/variant.h" #include "scene/resources/font.h" #include "servers/text_server.h" +class Font; + /*************************************************************************/ class TextParagraph : public RefCounted { diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 0ee0e4b33e2c..684dafba23c6 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -30,12 +30,24 @@ #include "texture.h" +#include + #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/io/file_access.h" #include "core/io/image_loader.h" #include "core/math/geometry_2d.h" +#include "core/math/math_funcs.h" +#include "core/math/transform_2d.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" #include "core/os/os.h" +#include "core/typedefs.h" #include "mesh.h" #include "scene/resources/bit_map.h" +#include "scene/resources/curve.h" +#include "scene/resources/gradient.h" #include "servers/camera/camera_feed.h" Size2 Texture2D::get_size() const { diff --git a/scene/resources/texture.h b/scene/resources/texture.h index 8075497c42ea..2e7995643eae 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -31,18 +31,40 @@ #ifndef TEXTURE_H #define TEXTURE_H +#include + +#include "core/error/error_list.h" #include "core/io/file_access.h" +#include "core/io/image.h" #include "core/io/resource.h" #include "core/io/resource_loader.h" +#include "core/math/color.h" #include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "core/os/mutex.h" #include "core/os/rw_lock.h" #include "core/os/thread_safe.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" +#include "core/templates/rid.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/resources/curve.h" #include "scene/resources/gradient.h" #include "servers/camera_server.h" #include "servers/rendering_server.h" +class Curve; +class FileAccess; +class Gradient; + class Texture : public Resource { GDCLASS(Texture, Resource); diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index f962e556668d..01f9ce1f7b70 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -29,7 +29,11 @@ /*************************************************************************/ #include "theme.h" -#include "core/string/print_string.h" + +#include "core/error/error_macros.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/templates/set.h" // Universal Theme resources used when no other theme has the item. Ref Theme::default_theme; diff --git a/scene/resources/theme.h b/scene/resources/theme.h index 822743a1fe51..0f4347375a23 100644 --- a/scene/resources/theme.h +++ b/scene/resources/theme.h @@ -33,6 +33,16 @@ #include "core/io/resource.h" #include "core/io/resource_loader.h" +#include "core/math/color.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "scene/resources/font.h" #include "scene/resources/style_box.h" #include "scene/resources/texture.h" diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index 1f77cc057072..1735b0d8011d 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -30,15 +30,27 @@ #include "tile_set.h" +#include +#include + #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/io/image.h" #include "core/io/marshalls.h" #include "core/math/geometry_2d.h" +#include "core/math/math_funcs.h" +#include "core/math/vector3.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/os/memory.h" #include "core/templates/local_vector.h" - +#include "core/templates/pair.h" +#include "core/variant/callable.h" +#include "core/variant/dictionary.h" #include "scene/2d/navigation_region_2d.h" -#include "scene/gui/control.h" +#include "scene/main/canvas_item.h" #include "scene/resources/convex_polygon_shape_2d.h" -#include "servers/navigation_server_2d.h" +#include "servers/rendering_server.h" /////////////////////////////// TileMapPattern ////////////////////////////////////// diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h index 95de46c9abeb..8f0fdd42f320 100644 --- a/scene/resources/tile_set.h +++ b/scene/resources/tile_set.h @@ -31,18 +31,43 @@ #ifndef TILE_SET_H #define TILE_SET_H +#include + #include "core/io/resource.h" +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/rect2i.h" +#include "core/math/transform_2d.h" +#include "core/math/vector2.h" +#include "core/math/vector2i.h" #include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/list.h" #include "core/templates/local_vector.h" +#include "core/templates/map.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/2d/light_occluder_2d.h" #include "scene/2d/navigation_region_2d.h" #include "scene/main/canvas_item.h" #include "scene/resources/concave_polygon_shape_2d.h" #include "scene/resources/convex_polygon_shape_2d.h" +#include "scene/resources/material.h" +#include "scene/resources/mesh.h" #include "scene/resources/packed_scene.h" #include "scene/resources/physics_material.h" #include "scene/resources/shape_2d.h" +class CanvasItem; + #ifndef DISABLE_DEPRECATED #include "scene/resources/shader.h" #include "scene/resources/texture.h" @@ -53,7 +78,6 @@ struct TileMapQuadrant; class TileSetSource; class TileSetAtlasSource; class TileData; - // Forward-declare the plugins. class TileSetPlugin; class TileSetPluginAtlasRendering; diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp index 1683756a3e28..dba83aec8f71 100644 --- a/scene/resources/visual_shader.cpp +++ b/scene/resources/visual_shader.cpp @@ -30,11 +30,24 @@ #include "visual_shader.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/transform_3d.h" +#include "core/math/vector3.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/object/script_language.h" +#include "core/string/char_utils.h" +#include "core/string/string_builder.h" +#include "core/templates/pair.h" #include "core/templates/vmap.h" +#include "core/typedefs.h" +#include "servers/rendering/shader_language.h" #include "servers/rendering/shader_types.h" #include "visual_shader_nodes.h" #include "visual_shader_particle_nodes.h" -#include "visual_shader_sdf_nodes.h" + +class Control; String make_unique_id(VisualShader::Type p_type, int p_id, const String &p_name) { static const char *typepf[VisualShader::TYPE_MAX] = { "vtx", "frg", "lgt", "start", "process", "collide", "start_custom", "process_custom", "sky", "fog" }; diff --git a/scene/resources/visual_shader.h b/scene/resources/visual_shader.h index e85bf696b04e..5813c32d675f 100644 --- a/scene/resources/visual_shader.h +++ b/scene/resources/visual_shader.h @@ -31,13 +31,39 @@ #ifndef VISUAL_SHADER_H #define VISUAL_SHADER_H +#include + +#include "core/error/error_list.h" +#include "core/io/resource.h" +#include "core/math/vector2.h" +#include "core/object/gdvirtual.gen.inc" +#include "core/object/object.h" +#include "core/object/ref_counted.h" #include "core/string/string_builder.h" +#include "core/string/string_name.h" +#include "core/string/ustring.h" +#include "core/templates/hash_map.h" +#include "core/templates/list.h" +#include "core/templates/map.h" #include "core/templates/safe_refcount.h" +#include "core/templates/set.h" +#include "core/templates/vector.h" +#include "core/variant/array.h" +#include "core/variant/binder_common.h" +#include "core/variant/dictionary.h" +#include "core/variant/typed_array.h" +#include "core/variant/variant.h" #include "scene/gui/control.h" #include "scene/resources/shader.h" +#include "scene/resources/texture.h" +#include "servers/rendering_server.h" class VisualShaderNodeUniform; class VisualShaderNode; +class Control; +class StringBuilder; +template +class VMap; class VisualShader : public Shader { GDCLASS(VisualShader, Shader); diff --git a/scene/resources/visual_shader_nodes.cpp b/scene/resources/visual_shader_nodes.cpp index 1205ba91c43a..e405401e3116 100644 --- a/scene/resources/visual_shader_nodes.cpp +++ b/scene/resources/visual_shader_nodes.cpp @@ -30,6 +30,16 @@ #include "visual_shader_nodes.h" +#include "core/error/error_macros.h" +#include "core/math/basis.h" +#include "core/math/math_defs.h" +#include "core/math/math_funcs.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/typedefs.h" +#include "core/variant/variant.h" + ////////////// Vector Base VisualShaderNodeVectorBase::PortType VisualShaderNodeVectorBase::get_input_port_type(int p_port) const { diff --git a/scene/resources/visual_shader_nodes.h b/scene/resources/visual_shader_nodes.h index 5c7a674d349a..adfcf470a4d1 100644 --- a/scene/resources/visual_shader_nodes.h +++ b/scene/resources/visual_shader_nodes.h @@ -31,8 +31,22 @@ #ifndef VISUAL_SHADER_NODES_H #define VISUAL_SHADER_NODES_H +#include "core/math/color.h" +#include "core/math/transform_3d.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "scene/resources/shader.h" +#include "scene/resources/texture.h" #include "scene/resources/visual_shader.h" +class StringName; + /////////////////////////////////////// /// Vector Base Node /////////////////////////////////////// diff --git a/scene/resources/visual_shader_particle_nodes.cpp b/scene/resources/visual_shader_particle_nodes.cpp index 3376d6aa0bdf..caec2d3c8556 100644 --- a/scene/resources/visual_shader_particle_nodes.cpp +++ b/scene/resources/visual_shader_particle_nodes.cpp @@ -31,6 +31,19 @@ #include "visual_shader_particle_nodes.h" #include "core/core_string_names.h" +#include "core/error/error_macros.h" +#include "core/io/image.h" +#include "core/math/color.h" +#include "core/math/vector2.h" +#include "core/math/vector3.h" +#include "core/object/callable_method_pointer.h" +#include "core/object/class_db.h" +#include "core/string/string_name.h" +#include "core/templates/list.h" +#include "core/typedefs.h" +#include "core/variant/array.h" +#include "core/variant/callable.h" +#include "core/variant/variant.h" // VisualShaderNodeParticleEmitter diff --git a/scene/resources/visual_shader_particle_nodes.h b/scene/resources/visual_shader_particle_nodes.h index ce0d896c01b3..54ef7cdcb5be 100644 --- a/scene/resources/visual_shader_particle_nodes.h +++ b/scene/resources/visual_shader_particle_nodes.h @@ -31,8 +31,22 @@ #ifndef VISUAL_SHADER_PARTICLE_NODES_H #define VISUAL_SHADER_PARTICLE_NODES_H +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/string/ustring.h" +#include "core/templates/map.h" +#include "core/templates/vector.h" +#include "core/variant/binder_common.h" +#include "scene/resources/mesh.h" +#include "scene/resources/shader.h" +#include "scene/resources/texture.h" #include "scene/resources/visual_shader.h" +class StringName; +struct Color; +struct Vector2; +struct Vector3; + // Emit nodes class VisualShaderNodeParticleEmitter : public VisualShaderNode { diff --git a/scene/resources/visual_shader_sdf_nodes.h b/scene/resources/visual_shader_sdf_nodes.h index 7c1f695423ea..9e31874225dc 100644 --- a/scene/resources/visual_shader_sdf_nodes.h +++ b/scene/resources/visual_shader_sdf_nodes.h @@ -31,6 +31,9 @@ #ifndef VISUAL_SHADER_SDF_NODES_H #define VISUAL_SHADER_SDF_NODES_H +#include "core/object/object.h" +#include "core/string/ustring.h" +#include "scene/resources/shader.h" #include "scene/resources/visual_shader.h" class VisualShaderNodeSDFToScreenUV : public VisualShaderNode { diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp index 9d8e0f754769..0eb6d7199b2d 100644 --- a/scene/resources/world_2d.cpp +++ b/scene/resources/world_2d.cpp @@ -31,9 +31,9 @@ #include "world_2d.h" #include "core/config/project_settings.h" -#include "scene/2d/camera_2d.h" -#include "scene/2d/visible_on_screen_notifier_2d.h" -#include "scene/main/window.h" +#include "core/math/vector2.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" #include "servers/navigation_server_2d.h" #include "servers/physics_server_2d.h" #include "servers/rendering_server.h" diff --git a/scene/resources/world_2d.h b/scene/resources/world_2d.h index 91f9a026d3c1..8f80c31a5f09 100644 --- a/scene/resources/world_2d.h +++ b/scene/resources/world_2d.h @@ -33,11 +33,16 @@ #include "core/config/project_settings.h" #include "core/io/resource.h" +#include "core/object/object.h" +#include "core/templates/rid.h" +#include "core/templates/set.h" +#include "core/typedefs.h" #include "servers/physics_server_2d.h" class VisibleOnScreenNotifier2D; class Viewport; struct SpatialIndexer2D; +class PhysicsDirectSpaceState2D; class World2D : public Resource { GDCLASS(World2D, Resource); diff --git a/scene/resources/world_3d.cpp b/scene/resources/world_3d.cpp index c012ab617732..f6b094eb28c8 100644 --- a/scene/resources/world_3d.cpp +++ b/scene/resources/world_3d.cpp @@ -30,12 +30,15 @@ #include "world_3d.h" -#include "core/math/camera_matrix.h" -#include "core/math/octree.h" -#include "scene/3d/camera_3d.h" -#include "scene/3d/visible_on_screen_notifier_3d.h" -#include "scene/scene_string_names.h" +#include "core/config/project_settings.h" +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" +#include "scene/resources/camera_effects.h" +#include "scene/resources/environment.h" #include "servers/navigation_server_3d.h" +#include "servers/physics_server_3d.h" +#include "servers/rendering_server.h" void World3D::_register_camera(Camera3D *p_camera) { #ifndef _3D_DISABLED diff --git a/scene/resources/world_3d.h b/scene/resources/world_3d.h index b34b7a2bfb3e..54cdeda9de5f 100644 --- a/scene/resources/world_3d.h +++ b/scene/resources/world_3d.h @@ -32,6 +32,11 @@ #define WORLD_3D_H #include "core/io/resource.h" +#include "core/object/object.h" +#include "core/object/ref_counted.h" +#include "core/templates/rid.h" +#include "core/templates/set.h" +#include "core/typedefs.h" #include "scene/resources/camera_effects.h" #include "scene/resources/environment.h" #include "servers/physics_server_3d.h" @@ -40,6 +45,9 @@ class Camera3D; class VisibleOnScreenNotifier3D; struct SpatialIndexer; +class CameraEffects; +class Environment; +class PhysicsDirectSpaceState3D; class World3D : public Resource { GDCLASS(World3D, Resource); diff --git a/scene/resources/world_boundary_shape_2d.cpp b/scene/resources/world_boundary_shape_2d.cpp index 9789388c6a7f..88aaf06c958a 100644 --- a/scene/resources/world_boundary_shape_2d.cpp +++ b/scene/resources/world_boundary_shape_2d.cpp @@ -31,9 +31,14 @@ #include "world_boundary_shape_2d.h" #include "core/math/geometry_2d.h" +#include "core/object/class_db.h" +#include "core/variant/array.h" +#include "core/variant/variant.h" #include "servers/physics_server_2d.h" #include "servers/rendering_server.h" +class RID; + bool WorldBoundaryShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { Vector2 point = get_distance() * get_normal(); Vector2 l[2][2] = { { point - get_normal().orthogonal() * 100, point + get_normal().orthogonal() * 100 }, { point, point + get_normal() * 30 } }; diff --git a/scene/resources/world_boundary_shape_2d.h b/scene/resources/world_boundary_shape_2d.h index 3275e8c916c1..1861f38a6b86 100644 --- a/scene/resources/world_boundary_shape_2d.h +++ b/scene/resources/world_boundary_shape_2d.h @@ -31,8 +31,15 @@ #ifndef WORLD_BOUNDARY_SHAPE_2D_H #define WORLD_BOUNDARY_SHAPE_2D_H +#include "core/math/color.h" +#include "core/math/math_defs.h" +#include "core/math/rect2.h" +#include "core/math/vector2.h" +#include "core/object/object.h" #include "scene/resources/shape_2d.h" +class RID; + class WorldBoundaryShape2D : public Shape2D { GDCLASS(WorldBoundaryShape2D, Shape2D); diff --git a/scene/resources/world_boundary_shape_3d.cpp b/scene/resources/world_boundary_shape_3d.cpp index 09d41e82919d..41de1ae93436 100644 --- a/scene/resources/world_boundary_shape_3d.cpp +++ b/scene/resources/world_boundary_shape_3d.cpp @@ -30,6 +30,11 @@ #include "world_boundary_shape_3d.h" +#include + +#include "core/math/vector3.h" +#include "core/object/class_db.h" +#include "core/variant/variant.h" #include "servers/physics_server_3d.h" Vector WorldBoundaryShape3D::get_debug_mesh_lines() const { diff --git a/scene/resources/world_boundary_shape_3d.h b/scene/resources/world_boundary_shape_3d.h index 5378bc52c7e8..18466fa4617d 100644 --- a/scene/resources/world_boundary_shape_3d.h +++ b/scene/resources/world_boundary_shape_3d.h @@ -31,8 +31,14 @@ #ifndef WORLD_BOUNDARY_SHAPE_3D_H #define WORLD_BOUNDARY_SHAPE_3D_H +#include "core/math/math_defs.h" +#include "core/math/plane.h" +#include "core/object/object.h" +#include "core/templates/vector.h" #include "scene/resources/shape_3d.h" +struct Vector3; + class WorldBoundaryShape3D : public Shape3D { GDCLASS(WorldBoundaryShape3D, Shape3D); Plane plane; diff --git a/scene/scene_string_names.h b/scene/scene_string_names.h index 5589ab327f7e..55c31e64aaa5 100644 --- a/scene/scene_string_names.h +++ b/scene/scene_string_names.h @@ -31,8 +31,10 @@ #ifndef SCENE_STRING_NAMES_H #define SCENE_STRING_NAMES_H +#include "core/os/memory.h" #include "core/string/node_path.h" #include "core/string/string_name.h" +#include "core/typedefs.h" class SceneStringNames { friend void register_scene_types();