mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 03:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50581 from DavidCambre/VisualScript-Drop-Custom-Nodes

Browse Source 
Allow dropping custom node scripts in VisualScript editor
This commit is contained in:
Rémi Verschelde 2021-07-20 12:46:50 +02:00 committed by GitHub
commit 124e27b7b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/visual_script/visual_script_editor.cpp
View File

@ -2172,6 +2172,11 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
} }
if (String(d["type"]) == "files") { if (String(d["type"]) == "files") {
#ifdef OSX_ENABLED
bool use_preload = Input::get_singleton()->is_key_pressed(KEY_META);
#else
bool use_preload = Input::get_singleton()->is_key_pressed(KEY_CTRL);
#endif
Vector2 pos = _get_pos_in_graph(p_point); Vector2 pos = _get_pos_in_graph(p_point);
Array files = d["files"]; Array files = d["files"];
@ -2187,13 +2192,22 @@ void VisualScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
if (!res.is_valid()) { if (!res.is_valid()) {
continue; continue;
} }
Ref<Script> drop_script = ResourceLoader::load(files[i]);
if (drop_script.is_valid() && drop_script->is_tool() && drop_script->get_instance_base_type() == "VisualScriptCustomNode" && !use_preload) {
Ref<VisualScriptCustomNode> vscn;
vscn.instantiate();
vscn->set_script(drop_script);
Ref<VisualScriptPreload> prnode; undo_redo->add_do_method(script.ptr(), "add_node", new_id, vscn, pos);
prnode.instantiate(); undo_redo->add_undo_method(script.ptr(), "remove_node", new_id);
prnode->set_preload(res); } else {
Ref<VisualScriptPreload> prnode;
prnode.instantiate();
prnode->set_preload(res);
undo_redo->add_do_method(script.ptr(), "add_node", new_id, prnode, pos); undo_redo->add_do_method(script.ptr(), "add_node", new_id, prnode, pos);
undo_redo->add_undo_method(script.ptr(), "remove_node", new_id); undo_redo->add_undo_method(script.ptr(), "remove_node", new_id);
}
new_ids.push_back(new_id); new_ids.push_back(new_id);
new_id++; new_id++;
pos += Vector2(20, 20); pos += Vector2(20, 20);