Instantiating scenes

Author: carsonetb

editor/create_dialog.h

@@ -52,7 +52,6 @@ class CreateDialog : public ConfirmationDialog {
 	};
 
 	LineEdit *search_box = nullptr;
-	Tree *search_options = nullptr;
 
 	String base_type;
 	bool is_base_type_node = false;
@@ -114,6 +113,7 @@ class CreateDialog : public ConfirmationDialog {
 	void _save_and_update_favorite_list();
 
 public:
+	Tree *search_options = nullptr;
 	Variant instantiate_selected();
 	String get_selected_type();
 

editor/scene_tree_dock.cpp

@@ -288,7 +288,7 @@ void SceneTreeDock::instantiate_scenes(const Vector<String> &p_files, Node *p_pa
 	_perform_instantiate_scenes(p_files, parent, -1);
 }
 
-void SceneTreeDock::_perform_instantiate_scenes(const Vector<String> &p_files, Node *p_parent, int p_pos) {
+void SceneTreeDock::_perform_instantiate_scenes(const Vector<String> &p_files, Node *p_parent, int p_pos, bool should_emit) {
 	ERR_FAIL_NULL(p_parent);
 
 	Vector<Node *> instances;
@@ -335,6 +335,31 @@ void SceneTreeDock::_perform_instantiate_scenes(const Vector<String> &p_files, N
 		return;
 	}
 
+	if (!should_emit) {
+		editor_selection->clear();
+		for (int i = 0; i < instances.size(); i++) {
+			Node *instantiated_scene = instances[i];
+
+			p_parent->add_child(instantiated_scene, true);
+			if (p_pos >= 0) {
+				p_parent->move_child(instantiated_scene, p_pos + i);
+			}
+			instantiated_scene->set_owner(edited_scene);
+			editor_selection->add_node(instantiated_scene);
+			
+			String new_name = p_parent->validate_child_name(instantiated_scene);
+			EditorDebuggerNode *ed = EditorDebuggerNode::get_singleton();
+			ed->live_debug_instantiate_node(edited_scene->get_path_to(p_parent), p_files[i], new_name);
+		}
+
+		_push_item(instances[instances.size() - 1]);
+		for (int i = 0; i < instances.size(); i++) {
+			emit_signal(SNAME("node_created"), instances[i]);
+		}
+
+		return;
+	}
+
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action_for_history(TTRN("Instantiate Scene", "Instantiate Scenes", instances.size()), editor_data->get_current_edited_scene_history_id());
 	undo_redo->add_do_method(editor_selection, "clear");
@@ -362,6 +387,8 @@ void SceneTreeDock::_perform_instantiate_scenes(const Vector<String> &p_files, N
 	for (int i = 0; i < instances.size(); i++) {
 		emit_signal(SNAME("node_created"), instances[i]);
 	}
+
+	emit_signal("scenes_instantiated", p_parent, p_files, p_pos);
 }
 
 void SceneTreeDock::_perform_create_audio_stream_players(const Vector<String> &p_files, Node *p_parent, int p_pos) {
@@ -2951,6 +2978,13 @@ Node *SceneTreeDock::_do_create(Node *p_parent) {
 	undo_redo->add_do_method(this, "_post_do_create", child);
 	undo_redo->commit_action();
 
+	TreeItem *selected = create_dialog->search_options->get_selected();
+	String non_global_type_name = selected->get_text(0);
+	Array meta = selected->get_metadata(0).operator Array();
+	bool is_custom_type = meta[0].operator bool();
+	String type = meta[1].operator String();
+	emit_signal("node_created_type", child, type, is_custom_type, non_global_type_name);
+
 	return child;
 }
 
@@ -4643,6 +4677,8 @@ void SceneTreeDock::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("add_node_used"));
 	ADD_SIGNAL(MethodInfo("node_created", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
 	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")));
 }
 
 SceneTreeDock *SceneTreeDock::singleton = nullptr;

editor/scene_tree_dock.h

@@ -268,7 +268,6 @@ class SceneTreeDock : public VBoxContainer {
 	void _filter_option_selected(int option);
 	void _append_filter_options_to(PopupMenu *p_menu, bool p_include_separator = true);
 
-	void _perform_instantiate_scenes(const Vector<String> &p_files, Node *p_parent, int p_pos);
 	void _perform_create_audio_stream_players(const Vector<String> &p_files, Node *p_parent, int p_pos);
 	void _replace_with_branch_scene(const String &p_file, Node *base);
 
@@ -304,6 +303,7 @@ class SceneTreeDock : public VBoxContainer {
 	static SceneTreeDock *singleton;
 
 public:
+	void _perform_instantiate_scenes(const Vector<String> &p_files, Node *p_parent, int p_pos, bool should_emit = true);
 	static SceneTreeDock *get_singleton() { return singleton; }
 
 protected:

modules/multi_godot/multi_godot.cpp

@@ -34,6 +34,8 @@ void MultiGodot::_bind_methods() {
     ClassDB::bind_method(D_METHOD("_on_p2p_session_request", "remote_id"), &MultiGodot::_on_p2p_session_request);
     ClassDB::bind_method(D_METHOD("_on_p2p_session_connect_fail", "steam_id", "session_error"), &MultiGodot::_on_p2p_session_connect_fail);
     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);
 
     // Remote Callables
 
@@ -52,6 +54,8 @@ void MultiGodot::_bind_methods() {
     ClassDB::bind_method(D_METHOD("_apply_action"), &MultiGodot::_apply_action);
     ClassDB::bind_method(D_METHOD("_instantiate_resource", "node_path", "resource_path", "type"), &MultiGodot::_instantiate_resource);
     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);
 
     // Button signals
 
@@ -118,7 +122,11 @@ void MultiGodot::_ready() {
 
     filesystem_scanner.start(_threaded_filesystem_scanner, this);
 
-    SceneTreeDock::get_singleton()->connect("nodes_reparented", Callable(this, "_on_nodes_reparented"));
+    SceneTreeDock *scene_tree_dock = SceneTreeDock::get_singleton();
+
+    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"));
     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"));
@@ -1125,6 +1133,35 @@ void MultiGodot::_reparent_nodes(Array paths, String new_parent_path) {
     }
 }
 
+void MultiGodot::_create_node(String parent_path, String type, bool is_custom_type, String weird_type) {
+    Node *root = EditorNode::get_singleton()->get_edited_scene();
+    Node *parent = root->get_node(parent_path);
+
+    Variant obj;
+	if (is_custom_type) {
+		if (ScriptServer::is_global_class(type)) {
+			obj = EditorNode::get_editor_data().script_class_instance(type);
+			Node *n = Object::cast_to<Node>(obj);
+			if (n) {
+				n->set_name(type);
+			}
+		} else {
+			obj = EditorNode::get_editor_data().instantiate_custom_type(weird_type, type);
+		}
+	} else {
+		obj = ClassDB::instantiate(type);
+	}
+
+    obj.operator Object *();
+    Node *node = Object::cast_to<Node>(obj);
+    parent->add_child(node, true);
+}
+
+void MultiGodot::_instantiate_scenes(String parent_path, Vector<String> paths, int index) {
+    Node *root = EditorNode::get_singleton()->get_edited_scene();
+    SceneTreeDock::get_singleton()->_perform_instantiate_scenes(paths, root->get_node(parent_path), index, false);
+}
+
 // SIGNALS
 
 void MultiGodot::_on_lobby_created(int connect, uint64_t this_lobby_id) {
@@ -1290,6 +1327,22 @@ void MultiGodot::_on_nodes_reparented(Array nodes, NodePath new_parent) {
     _call_func(this, "_reparent_nodes", {nodes, new_parent});
 }
 
+void MultiGodot::_on_node_created(Node *node, String type, bool is_custom_type, String weird_type) {
+    if (VERBOSE_DEBUG) {
+        print_line("Node created with type " + type);
+    }
+    Node *root = EditorNode::get_singleton()->get_edited_scene();
+    _call_func(this, "_create_node", {root->get_path_to(node->get_parent()), type, is_custom_type, weird_type});
+}
+
+void MultiGodot::_on_scenes_instantiated(Node *parent, Vector<String> paths, int index) {
+    if (VERBOSE_DEBUG) {
+        print_line("Some scenes were instantiated");
+    }
+    Node *root = EditorNode::get_singleton()->get_edited_scene();
+    _call_func(this, "_instantiate_scenes", {root->get_path_to(parent), paths, index});
+}
+
 // PLUGIN
 
 MultiGodotPlugin::MultiGodotPlugin() {

modules/multi_godot/multi_godot.h

@@ -131,6 +131,8 @@ class MultiGodot : public Node2D {
         void _apply_action(String node_path, String property_path, Variant value);
         void _instantiate_resource(String node_path, String resource_path, String type);
         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);
 
         // SIGNALS
 
@@ -143,6 +145,8 @@ class MultiGodot : public Node2D {
         void _on_editor_tab_changed(int index);
         void _on_current_script_path_changed(String path);
         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);
 
     public:
         MultiGodot();