diff options
author | Paulb23 <p_batty@hotmail.co.uk> | 2016-05-13 17:09:49 +0100 |
---|---|---|
committer | Paulb23 <p_batty@hotmail.co.uk> | 2016-05-13 20:05:52 +0100 |
commit | aee156dc023e8cf4db5c5ee51fe6b2b46c7c1660 (patch) | |
tree | 24fa9a2bd9a74b6a0f718819b5c1b8d5fe3fa78a /scene/main | |
parent | bd3dbe5fa306c96f79190ccfcd116436d27acb93 (diff) |
Node duplication positions under duplicated node, issue 964
Diffstat (limited to 'scene/main')
-rw-r--r-- | scene/main/node.cpp | 12 | ||||
-rw-r--r-- | scene/main/node.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index da14fa1111..e85b3698c8 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -749,6 +749,16 @@ void Node::add_child(Node *p_child, bool p_legible_unique_name) { } +void Node::add_child_below_node(Node *p_node, Node *p_child, bool p_legible_unique_name) { + add_child(p_child, p_legible_unique_name); + + if (is_a_parent_of(p_node)) { + move_child(p_child, p_node->get_position_in_parent() + 1); + } else { + WARN_PRINTS("Cannot move under node " + p_node->get_name() + " as " + p_child->get_name() + " does not share a parent") + } +} + void Node::_propagate_validate_owner() { @@ -2012,6 +2022,8 @@ void Node::clear_internal_tree_resource_paths() { void Node::_bind_methods() { + ObjectTypeDB::bind_method(_MD("_add_child_below_node","node:Node","child_node:Node","legible_unique_name"),&Node::add_child_below_node,DEFVAL(false)); + ObjectTypeDB::bind_method(_MD("set_name","name"),&Node::set_name); ObjectTypeDB::bind_method(_MD("get_name"),&Node::get_name); ObjectTypeDB::bind_method(_MD("add_child","node:Node","legible_unique_name"),&Node::add_child,DEFVAL(false)); diff --git a/scene/main/node.h b/scene/main/node.h index 83086bb0cf..4756909e23 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -190,6 +190,7 @@ public: void set_name(const String& p_name); void add_child(Node *p_child,bool p_legible_unique_name=false); + void add_child_below_node(Node *p_node, Node *p_child, bool p_legible_unique_name=false); void remove_child(Node *p_child); int get_child_count() const; |