Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix behavior of 'Editable Children' toggle #60974

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Fix behavior of 'Editable Children' toggle #60974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions editor/plugins/node_3d_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8061,6 +8061,8 @@ void Node3DEditor::_bind_methods() {
ClassDB::bind_method("_clear_subgizmo_selection", &Node3DEditor::_clear_subgizmo_selection);
ClassDB::bind_method("_refresh_menu_icons", &Node3DEditor::_refresh_menu_icons);

ClassDB::bind_method("update_all_gizmos", &Node3DEditor::update_all_gizmos);

ADD_SIGNAL(MethodInfo("transform_key_request"));
ADD_SIGNAL(MethodInfo("item_lock_status_changed"));
ADD_SIGNAL(MethodInfo("item_group_status_changed"));
Expand Down
123 changes: 114 additions & 9 deletions editor/scene_tree_dock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
/**************************************************************************/

#include "scene_tree_dock.h"
#include "node_dock.h"

#include "core/config/project_settings.h"
#include "core/input/input.h"
Expand All @@ -50,6 +49,7 @@
#include "editor/gui/editor_file_dialog.h"
#include "editor/inspector_dock.h"
#include "editor/multi_node_edit.h"
#include "editor/node_dock.h"
#include "editor/plugins/animation_player_editor_plugin.h"
#include "editor/plugins/canvas_item_editor_plugin.h"
#include "editor/plugins/node_3d_editor_plugin.h"
Expand Down Expand Up @@ -2320,18 +2320,121 @@ void SceneTreeDock::_toggle_placeholder_from_selection() {
}
}

void SceneTreeDock::_toggle_editable_children(Node *p_node) {
if (p_node) {
bool editable = !EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(p_node);
EditorNode::get_singleton()->get_edited_scene()->set_editable_instance(p_node, editable);
if (editable) {
p_node->set_scene_instance_load_placeholder(false);
void SceneTreeDock::_reparent_nodes_to_root(Node *p_root, const Array &p_nodes, Node *p_owner) {
List<Node *> nodes;
for (int i = 0; i < p_nodes.size(); i++) {
Node *node = Object::cast_to<Node>(p_nodes[i]);
ERR_FAIL_NULL(node);
nodes.push_back(node);
}

for (Node *node : nodes) {
node->set_owner(p_owner);
KoBeWi marked this conversation as resolved.
Show resolved Hide resolved
List<Node *> owned;
node->get_owned_by(p_owner, &owned);
String original_name = node->get_name();
node->reparent(p_root);
node->set_name(original_name);

for (Node *F : owned) {
F->set_owner(p_owner);
}
}
}

void SceneTreeDock::_reparent_nodes_to_paths_with_transform_and_name(Node *p_root, const Array &p_nodes, const Array &p_paths, const Array &p_transforms, const Array &p_names, Node *p_owner) {
ERR_FAIL_COND(p_nodes.size() != p_paths.size());
ERR_FAIL_COND(p_nodes.size() != p_transforms.size());
ERR_FAIL_COND(p_nodes.size() != p_names.size());

for (int i = 0; i < p_nodes.size(); i++) {
Node *node = Object::cast_to<Node>(p_nodes[i]);
ERR_FAIL_NULL(node);
const NodePath &np = p_paths[i];
Node *parent_node = p_root->get_node_or_null(np);
ERR_FAIL_NULL(parent_node);

List<Node *> owned;
node->get_owned_by(p_owner, &owned);
node->reparent(parent_node);
node->set_name(p_names[i]);
KoBeWi marked this conversation as resolved.
Show resolved Hide resolved
Node3D *node_3d = Object::cast_to<Node3D>(node);
if (node_3d) {
node_3d->set_transform(p_transforms[i]);
} else {
Node2D *node_2d = Object::cast_to<Node2D>(node);
if (node_2d) {
node_2d->set_transform(p_transforms[i]);
}
}

Node3DEditor::get_singleton()->update_all_gizmos(p_node);
for (Node *F : owned) {
F->set_owner(p_owner);
}
}
}

void SceneTreeDock::_toggle_editable_children(Node *p_node) {
if (!p_node) {
return;
}

EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();

undo_redo->create_action(TTR("Toggle Editable Children"));

bool editable = !EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(p_node);

undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_editable_instance", p_node, !editable);
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_editable_instance", p_node, editable);

if (editable) {
bool original_scene_instance_load_placeholder = p_node->get_scene_instance_load_placeholder();

undo_redo->add_undo_method(p_node, "set_scene_instance_load_placeholder", original_scene_instance_load_placeholder);
undo_redo->add_do_method(p_node, "set_scene_instance_load_placeholder", false);
} else {
List<Node *> owned;
p_node->get_owned_by(edited_scene, &owned);

// Get the original paths, transforms, and names for undo.
Array owned_nodes_array;
Array paths_array;
Array transform_array;
Array name_array;

for (Node *owned_node : owned) {
if (owned_node != p_node && owned_node != edited_scene && owned_node->get_owner() == edited_scene && owned_node->get_parent()->get_owner() != edited_scene) {
owned_nodes_array.push_back(owned_node);
paths_array.push_back(p_node->get_path_to(owned_node->get_parent()));
name_array.push_back(owned_node->get_name());
Node3D *node_3d = Object::cast_to<Node3D>(owned_node);
if (node_3d) {
transform_array.push_back(node_3d->get_transform());
} else {
Node2D *node_2d = Object::cast_to<Node2D>(owned_node);
if (node_2d) {
transform_array.push_back(node_2d->get_transform());
} else {
transform_array.push_back(Variant());
}
}
}
}

scene_tree->update_tree();
if (!owned_nodes_array.is_empty()) {
undo_redo->add_undo_method(this, "_reparent_nodes_to_paths_with_transform_and_name", p_node, owned_nodes_array, paths_array, transform_array, name_array, edited_scene);
KoBeWi marked this conversation as resolved.
Show resolved Hide resolved
undo_redo->add_do_method(this, "_reparent_nodes_to_root", p_node, owned_nodes_array, edited_scene);
}
}

undo_redo->add_undo_method(Node3DEditor::get_singleton(), "update_all_gizmos", p_node);
undo_redo->add_do_method(Node3DEditor::get_singleton(), "update_all_gizmos", p_node);

undo_redo->add_undo_method(scene_tree, "update_tree");
undo_redo->add_do_method(scene_tree, "update_tree");

undo_redo->commit_action();
}

void SceneTreeDock::_delete_confirm(bool p_cut) {
Expand Down Expand Up @@ -3957,6 +4060,8 @@ void SceneTreeDock::_edit_subresource(int p_idx, const PopupMenu *p_from_menu) {

void SceneTreeDock::_bind_methods() {
ClassDB::bind_method(D_METHOD("_set_owners"), &SceneTreeDock::_set_owners);
ClassDB::bind_method(D_METHOD("_reparent_nodes_to_root"), &SceneTreeDock::_reparent_nodes_to_root);
ClassDB::bind_method(D_METHOD("_reparent_nodes_to_paths_with_transform_and_name"), &SceneTreeDock::_reparent_nodes_to_paths_with_transform_and_name);

ClassDB::bind_method(D_METHOD("_update_script_button"), &SceneTreeDock::_update_script_button);

Expand Down
3 changes: 3 additions & 0 deletions editor/scene_tree_dock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ class SceneTreeDock : public VBoxContainer {
void _delete_dialog_closed();

void _toggle_editable_children_from_selection();

void _reparent_nodes_to_root(Node *p_root, const Array &p_nodes, Node *p_owner);
void _reparent_nodes_to_paths_with_transform_and_name(Node *p_root, const Array &p_nodes, const Array &p_paths, const Array &p_transforms, const Array &p_names, Node *p_owner);
void _toggle_editable_children(Node *p_node);

void _toggle_placeholder_from_selection();
Expand Down
Loading