Merge pull request #117098 from akien-mga/decouple-node-scenetree

Decouple `node.h` from `scene_tree.h`, minimize its other includes

Author: akien-mga

core/input/input_event.cpp

@@ -32,9 +32,11 @@
 
 #include "core/input/input_map.h"
 #include "core/input/shortcut.h"
+#include "core/math/transform_2d.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
+#include "core/string/ustring.h"
 
 void InputEvent::set_device(int p_device) {
 	device = p_device;

core/input/input_event.h

@@ -32,9 +32,7 @@
 
 #include "core/input/input_enums.h"
 #include "core/io/resource.h"
-#include "core/math/transform_2d.h"
 #include "core/os/keyboard.h"
-#include "core/string/ustring.h"
 #include "core/typedefs.h"
 
 /**
@@ -43,6 +41,8 @@
  */
 
 class Shortcut;
+class String;
+struct Transform2D;
 
 /**
  * Input Modifier Status

core/io/resource.h

@@ -33,7 +33,6 @@
 #include "core/io/resource_uid.h"
 #include "core/object/gdvirtual.gen.h"
 #include "core/object/ref_counted.h"
-#include "core/templates/safe_refcount.h"
 #include "core/templates/self_list.h"
 
 class Node;
@@ -68,7 +67,6 @@ class Resource : public RefCounted {
 	};
 
 private:
-	friend class ResBase;
 	friend class ResourceCache;
 
 	String name;

core/io/resource_uid.h

@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "core/object/ref_counted.h"
-#include "core/string/string_name.h"
+#include "core/object/object.h"
+#include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 
 class FileAccess;

core/object/message_queue.h

@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/object/object_id.h"
-#include "core/os/thread_safe.h"
+#include "core/os/mutex.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
 #include "core/variant/variant.h"

core/os/keyboard.cpp

@@ -31,6 +31,7 @@
 #include "keyboard.h"
 
 #include "core/os/os.h"
+#include "core/string/ustring.h"
 
 struct _KeyCodeText {
 	Key code;

core/os/keyboard.h

@@ -30,7 +30,9 @@
 
 #pragma once
 
-#include "core/string/ustring.h"
+class String;
+
+#include <cstdint>
 
 // Keep the values in this enum in sync with `_keycodes` in `keyboard.cpp`,
 // and the bindings in `core_constants.cpp`.

editor/animation/animation_library_editor.cpp

@@ -46,6 +46,7 @@
 #include "scene/animation/animation_mixer.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/packed_scene.h"
 
 void AnimationLibraryEditor::set_animation_mixer(Object *p_mixer) {

editor/animation/animation_player_editor_plugin.cpp

@@ -52,6 +52,7 @@
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/animation/animation_tree.h"
 #include "scene/gui/separator.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/image_texture.h"
@@ -471,12 +472,12 @@ void AnimationPlayerEditor::_animation_selected(int p_which) {
 			Node *root = player->get_node_or_null(player->get_root_node());
 
 			// Player shouldn't access parent if it's the scene root.
-			if (!root || (player == get_tree()->get_edited_scene_root() && player->get_root_node() == SceneStringName(path_pp))) {
+			if (!root || (player == get_tree()->get_edited_scene_root() && player->get_root_node() == NodePath(".."))) {
 				NodePath cached_root_path = player->get_path_to(get_cached_root_node());
 				if (player->get_node_or_null(cached_root_path) != nullptr) {
 					player->set_root_node(cached_root_path);
 				} else {
-					player->set_root_node(SceneStringName(path_pp)); // No other choice, preventing crash.
+					player->set_root_node(NodePath("..")); // No other choice, preventing crash.
 				}
 			} else {
 				cached_root_node_id = root->get_instance_id(); // Caching as `track_editor` can lose track of player's root node.

editor/animation/animation_track_editor.cpp

@@ -64,6 +64,7 @@
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/view_panner.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "servers/audio/audio_stream.h"