godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71385 from Chaosus/vs_fix_crash

This commit is contained in:
Yuri Rubinsky 2023-01-14 14:51:46 +03:00 committed by GitHub
parent a51ca2beaf 8180d38910
commit d2d5e548c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -129,30 +129,32 @@ void VisualShaderGraphPlugin::set_connections(const List<VisualShader::Connectio
void VisualShaderGraphPlugin::show_port_preview(VisualShader::Type p_type, int p_node_id, int p_port_id) { void VisualShaderGraphPlugin::show_port_preview(VisualShader::Type p_type, int p_node_id, int p_port_id) {
if (visual_shader->get_shader_type() == p_type && links.has(p_node_id) && links[p_node_id].output_ports.has(p_port_id)) { if (visual_shader->get_shader_type() == p_type && links.has(p_node_id) && links[p_node_id].output_ports.has(p_port_id)) {
for (const KeyValue<int, Port> &E : links[p_node_id].output_ports) { Link &link = links[p_node_id];
for (const KeyValue<int, Port> &E : link.output_ports) {
if (E.value.preview_button != nullptr) { if (E.value.preview_button != nullptr) {
E.value.preview_button->set_pressed(false); E.value.preview_button->set_pressed(false);
} }
} }
bool is_dirty = link.preview_pos < 0;
if (links[p_node_id].preview_visible && !is_dirty() && links[p_node_id].preview_box != nullptr) { if (!is_dirty && link.preview_visible && link.preview_box != nullptr) {
links[p_node_id].graph_node->remove_child(links[p_node_id].preview_box); link.graph_node->remove_child(link.preview_box);
memdelete(links[p_node_id].preview_box); memdelete(link.preview_box);
links[p_node_id].graph_node->reset_size(); link.preview_box = nullptr;
links[p_node_id].preview_visible = false; link.graph_node->reset_size();
link.preview_visible = false;
} }
if (p_port_id != -1 && links[p_node_id].output_ports[p_port_id].preview_button != nullptr) { if (p_port_id != -1 && link.output_ports[p_port_id].preview_button != nullptr) {
if (is_dirty()) { if (is_dirty) {
links[p_node_id].preview_pos = links[p_node_id].graph_node->get_child_count(); link.preview_pos = link.graph_node->get_child_count();
} }
VBoxContainer *vbox = memnew(VBoxContainer); VBoxContainer *vbox = memnew(VBoxContainer);
links[p_node_id].graph_node->add_child(vbox); link.graph_node->add_child(vbox);
if (links[p_node_id].preview_pos != -1) { link.graph_node->move_child(vbox, link.preview_pos);
links[p_node_id].graph_node->move_child(vbox, links[p_node_id].preview_pos); link.graph_node->set_slot_draw_stylebox(vbox->get_index(), false);
}
links[p_node_id].graph_node->set_slot_draw_stylebox(vbox->get_index(), false);
Control *offset = memnew(Control); Control *offset = memnew(Control);
offset->set_custom_minimum_size(Size2(0, 5 * EDSCALE)); offset->set_custom_minimum_size(Size2(0, 5 * EDSCALE));
@ -162,9 +164,9 @@ void VisualShaderGraphPlugin::show_port_preview(VisualShader::Type p_type, int p
port_preview->setup(visual_shader, visual_shader->get_shader_type(), p_node_id, p_port_id); port_preview->setup(visual_shader, visual_shader->get_shader_type(), p_node_id, p_port_id);
port_preview->set_h_size_flags(Control::SIZE_SHRINK_CENTER); port_preview->set_h_size_flags(Control::SIZE_SHRINK_CENTER);
vbox->add_child(port_preview); vbox->add_child(port_preview);
links[p_node_id].preview_visible = true; link.preview_visible = true;
links[p_node_id].preview_box = vbox; link.preview_box = vbox;
links[p_node_id].output_ports[p_port_id].preview_button->set_pressed(true); link.output_ports[p_port_id].preview_button->set_pressed(true);
} }
} }
} }
@ -329,14 +331,6 @@ void VisualShaderGraphPlugin::clear_links() {
links.clear(); links.clear();
} }
bool VisualShaderGraphPlugin::is_dirty() const {
return dirty;
}
void VisualShaderGraphPlugin::make_dirty(bool p_enabled) {
dirty = p_enabled;
}
void VisualShaderGraphPlugin::register_link(VisualShader::Type p_type, int p_id, VisualShaderNode *p_visual_node, GraphNode *p_graph_node) { void VisualShaderGraphPlugin::register_link(VisualShader::Type p_type, int p_id, VisualShaderNode *p_visual_node, GraphNode *p_graph_node) {
links.insert(p_id, { p_type, p_visual_node, p_graph_node, p_visual_node->get_output_port_for_preview() != -1, -1, HashMap<int, InputPort>(), HashMap<int, Port>(), nullptr, nullptr, nullptr, { nullptr, nullptr, nullptr } }); links.insert(p_id, { p_type, p_visual_node, p_graph_node, p_visual_node->get_output_port_for_preview() != -1, -1, HashMap<int, InputPort>(), HashMap<int, Port>(), nullptr, nullptr, nullptr, { nullptr, nullptr, nullptr } });
} }
@ -426,7 +420,13 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id, bool
editor->_update_created_node(node); editor->_update_created_node(node);
if (p_just_update) { if (p_just_update) {
links[p_id].graph_node = node; Link &link = links[p_id];
link.graph_node = node;
link.preview_box = nullptr;
link.preview_pos = -1;
link.output_ports.clear();
link.input_ports.clear();
} else { } else {
register_link(p_type, p_id, vsnode.ptr(), node); register_link(p_type, p_id, vsnode.ptr(), node);
} }
@ -1916,15 +1916,12 @@ void VisualShaderEditor::_update_graph() {
_update_varyings(); _update_varyings();
graph_plugin->clear_links(); graph_plugin->clear_links();
graph_plugin->make_dirty(true);
graph_plugin->update_theme(); graph_plugin->update_theme();
for (int n_i = 0; n_i < nodes.size(); n_i++) { for (int n_i = 0; n_i < nodes.size(); n_i++) {
graph_plugin->add_node(type, nodes[n_i], false); graph_plugin->add_node(type, nodes[n_i], false);
} }
graph_plugin->make_dirty(false);
for (const VisualShader::Connection &E : node_connections) { for (const VisualShader::Connection &E : node_connections) {
int from = E.from_node; int from = E.from_node;
int from_idx = E.from_port; int from_idx = E.from_port;

3
editor/plugins/visual_shader_editor_plugin.h
View File

@ -95,7 +95,6 @@ private:
Ref<VisualShader> visual_shader; Ref<VisualShader> visual_shader;
HashMap<int, Link> links; HashMap<int, Link> links;
List<VisualShader::Connection> connections; List<VisualShader::Connection> connections;
bool dirty = false;
Color vector_expanded_color[4]; Color vector_expanded_color[4];
@ -115,8 +114,6 @@ public:
void clear_links(); void clear_links();
void set_shader_type(VisualShader::Type p_type); void set_shader_type(VisualShader::Type p_type);
bool is_preview_visible(int p_id) const; bool is_preview_visible(int p_id) const;
bool is_dirty() const;
void make_dirty(bool p_enabled);
void update_node(VisualShader::Type p_type, int p_id); void update_node(VisualShader::Type p_type, int p_id);
void update_node_deferred(VisualShader::Type p_type, int p_node_id); void update_node_deferred(VisualShader::Type p_type, int p_node_id);
void add_node(VisualShader::Type p_type, int p_id, bool p_just_update); void add_node(VisualShader::Type p_type, int p_id, bool p_just_update);