Deleting nodes

Author: carsonetb

editor/scene_tree_dock.cpp

@@ -2795,6 +2795,16 @@ void SceneTreeDock::_delete_confirm(bool p_cut) {
 	if (remove_list.is_empty()) {
 		return;
 	}
+	
+	Vector<Node *> nodes;
+	for (Node *n : remove_list) {
+		nodes.append(n);
+	}
+    Node *root = EditorNode::get_singleton()->get_edited_scene();
+    Vector<String> paths;
+    for (int i = 0; i < nodes.size(); i++) {
+        paths.append(root->get_path_to(nodes.get(i)));
+    }
 
 	bool entire_scene = false;
 
@@ -2882,6 +2892,8 @@ void SceneTreeDock::_delete_confirm(bool p_cut) {
 	InspectorDock::get_singleton()->call("_prepare_history");
 	InspectorDock::get_singleton()->update(nullptr);
 	NodeDock::get_singleton()->set_node(nullptr);
+
+	emit_signal("nodes_deleted", paths);
 }
 
 void SceneTreeDock::_update_script_button() {
@@ -4679,6 +4691,7 @@ void SceneTreeDock::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("nodes_reparented", PropertyInfo(Variant::ARRAY, "nodes"), PropertyInfo(Variant::NODE_PATH, "new_parent")));
 	ADD_SIGNAL(MethodInfo("node_created_type", PropertyInfo(Variant::OBJECT, "nodes"), PropertyInfo(Variant::STRING, "type"), PropertyInfo(Variant::BOOL, "is_custom_type"), PropertyInfo(Variant::STRING, "weird_type")));
 	ADD_SIGNAL(MethodInfo("scenes_instantiated", PropertyInfo(Variant::OBJECT, "parent"), PropertyInfo(Variant::PACKED_STRING_ARRAY, "paths"), PropertyInfo(Variant::INT, "index")));
+	ADD_SIGNAL(MethodInfo("nodes_deleted", PropertyInfo(Variant::PACKED_STRING_ARRAY, "paths")));
 }
 
 SceneTreeDock *SceneTreeDock::singleton = nullptr;

modules/multi_godot/multi_godot.cpp

@@ -36,6 +36,7 @@ void MultiGodot::_bind_methods() {
     ClassDB::bind_method(D_METHOD("_on_nodes_reparented", "nodes", "new_parent"), &MultiGodot::_on_nodes_reparented);
     ClassDB::bind_method(D_METHOD("_on_node_created", "node", "type", "is_custom_type", "weird_type"), &MultiGodot::_on_node_created);
     ClassDB::bind_method(D_METHOD("_on_scenes_instantiated", "parent", "paths", "index"), &MultiGodot::_on_scenes_instantiated);
+    ClassDB::bind_method(D_METHOD("_on_nodes_deleted", "nodes"), &MultiGodot::_on_nodes_deleted);
 
     // Remote Callables
 
@@ -56,6 +57,7 @@ void MultiGodot::_bind_methods() {
     ClassDB::bind_method(D_METHOD("_reparent_nodes", "old", "new"), &MultiGodot::_reparent_nodes);
     ClassDB::bind_method(D_METHOD("_create_node", "parent_path", "type", "is_custom_type", "weird_type"), &MultiGodot::_create_node);
     ClassDB::bind_method(D_METHOD("_instantiate_scenes", "parent_path", "paths", "index"), &MultiGodot::_instantiate_scenes);
+    ClassDB::bind_method(D_METHOD("_delete_nodes", "paths"), &MultiGodot::_delete_nodes);
 
     // Button signals
 
@@ -127,6 +129,7 @@ void MultiGodot::_ready() {
     scene_tree_dock->connect("nodes_reparented", Callable(this, "_on_nodes_reparented"));
     scene_tree_dock->connect("node_created_type", Callable(this, "_on_node_created"));
     scene_tree_dock->connect("scenes_instantiated", Callable(this, "_on_scenes_instantiated"));
+    scene_tree_dock->connect("nodes_deleted", Callable(this, "_on_nodes_deleted"));
     button_notifier->connect("editor_tab_changed", Callable(this, "_on_editor_tab_changed"));
     button_notifier->connect("current_script_path_changed", Callable(this, "_on_current_script_path_changed"));
     steam->connect("lobby_created", Callable(this, "_on_lobby_created"));
@@ -1164,6 +1167,13 @@ void MultiGodot::_instantiate_scenes(String parent_path, Vector<String> paths, i
     SceneTreeDock::get_singleton()->_perform_instantiate_scenes(paths, root->get_node(parent_path), index, false);
 }
 
+void MultiGodot::_delete_nodes(Vector<String> paths) {
+    Node *root = EditorNode::get_singleton()->get_edited_scene();
+    for (int i = 0; i < paths.size(); i++) {
+        root->get_node(paths.get(i))->queue_free();
+    }
+}
+
 // SIGNALS
 
 void MultiGodot::_on_lobby_created(int connect, uint64_t this_lobby_id) {
@@ -1345,6 +1355,13 @@ void MultiGodot::_on_scenes_instantiated(Node *parent, Vector<String> paths, int
     _call_func(this, "_instantiate_scenes", {root->get_path_to(parent), paths, index});
 }
 
+void MultiGodot::_on_nodes_deleted(Vector<String> paths) {
+    if (VERBOSE_DEBUG) {
+        print_line("Some scenes were deleted");
+    }
+    _call_func(this, "_delete_nodes", {paths});
+}
+
 // PLUGIN
 
 MultiGodotPlugin::MultiGodotPlugin() {

modules/multi_godot/multi_godot.h

@@ -133,6 +133,7 @@ class MultiGodot : public Node2D {
         void _reparent_nodes(Array paths, String new_path);
         void _create_node(String parent_path, String type, bool is_custom_type, String weird_type);
         void _instantiate_scenes(String parent_path, Vector<String> paths, int index);
+        void _delete_nodes(Vector<String> paths);
 
         // SIGNALS
 
@@ -147,6 +148,7 @@ class MultiGodot : public Node2D {
         void _on_nodes_reparented(Array nodes, NodePath new_parent);
         void _on_node_created(Node *node, String type, bool is_custom_type, String weird_type);
         void _on_scenes_instantiated(Node *parent, Vector<String> paths, int index);
+        void _on_nodes_deleted(Vector<String> paths);
 
     public:
         MultiGodot();