From 5d7b7f798af6a675149bf41939c9bb4c3c14d741 Mon Sep 17 00:00:00 2001 From: Geoffrey Date: Wed, 28 Feb 2018 10:12:06 +0100 Subject: [PATCH] Made print_tree_pretty() function which displays scene tree graphically (cherry picked from commit 8362ce4769b65f47c0d5d5a11d262a28a144e526) --- doc/classes/Node.xml | 25 ++++++++++++++++++++++++- scene/main/node.cpp | 22 ++++++++++++++++++---- scene/main/node.h | 2 ++ 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/doc/classes/Node.xml b/doc/classes/Node.xml index 9cd81ab13cc..98b3e2b498d 100644 --- a/doc/classes/Node.xml +++ b/doc/classes/Node.xml @@ -438,7 +438,30 @@ - Prints the scene to stdout. Used mainly for debugging purposes. + Prints the tree to stdout. Used mainly for debugging purposes. This version displays the path relative to the current node, and is good for copy/pasting into the [method get_node] function. Example output: + [codeblock] + TheGame + TheGame/Menu + TheGame/Menu/Label + TheGame/Menu/Camera2D + TheGame/SplashScreen + TheGame/SplashScreen/Camera2D + [/codeblock] + + + + + + + Similar to [method print_tree], this prints the tree to stdout. This version displays a more graphical representation similar to what is displayed in the scene inspector. It is useful for inspecting larger trees. Example output: + [codeblock] + ┖╴TheGame + ┠╴Menu + ┃ ┠╴Label + ┃ ┖╴Camera2D + ┖-SplashScreen + ┖╴Camera2D + [/codeblock] diff --git a/scene/main/node.cpp b/scene/main/node.cpp index cf22383e36f..7605a16e6c3 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -1868,11 +1868,18 @@ bool Node::has_persistent_groups() const { return false; } -void Node::_print_tree(const Node *p_node) { +void Node::_print_tree_pretty(const String prefix, const bool last) { - print_line(String(p_node->get_path_to(this))); - for (int i = 0; i < data.children.size(); i++) - data.children[i]->_print_tree(p_node); + String new_prefix = last ? String::utf8(" ┖╴") : String::utf8(" ┠╴"); + print_line(prefix + new_prefix + String(get_name())); + for (int i = 0; i < data.children.size(); i++) { + new_prefix = last ? String::utf8(" ") : String::utf8(" ┃ "); + data.children[i]->_print_tree_pretty(prefix + new_prefix, i == data.children.size() - 1); + } +} + +void Node::print_tree_pretty() { + _print_tree_pretty("", true); } void Node::print_tree() { @@ -1880,6 +1887,12 @@ void Node::print_tree() { _print_tree(this); } +void Node::_print_tree(const Node *p_node) { + print_line(String(p_node->get_path_to(this))); + for (int i = 0; i < data.children.size(); i++) + data.children[i]->_print_tree(p_node); +} + void Node::_propagate_reverse_notification(int p_notification) { data.blocked++; @@ -2837,6 +2850,7 @@ void Node::_bind_methods() { ClassDB::bind_method(D_METHOD("remove_and_skip"), &Node::remove_and_skip); ClassDB::bind_method(D_METHOD("get_index"), &Node::get_index); ClassDB::bind_method(D_METHOD("print_tree"), &Node::print_tree); + ClassDB::bind_method(D_METHOD("print_tree_pretty"), &Node::print_tree_pretty); ClassDB::bind_method(D_METHOD("set_filename", "filename"), &Node::set_filename); ClassDB::bind_method(D_METHOD("get_filename"), &Node::get_filename); ClassDB::bind_method(D_METHOD("propagate_notification", "what"), &Node::propagate_notification); diff --git a/scene/main/node.h b/scene/main/node.h index 341869f7ba9..87d59907e1a 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -151,6 +151,7 @@ private: NAME_CASING_SNAKE_CASE }; + void _print_tree_pretty(const String prefix, const bool last); void _print_tree(const Node *p_node); Node *_get_node(const NodePath &p_path) const; @@ -287,6 +288,7 @@ public: int get_index() const; void print_tree(); + void print_tree_pretty(); void set_filename(const String &p_filename); String get_filename() const;