Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-09-21 23:12:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #61314 from Chaosus/vs_fix_conversion_bug

Browse Source 
Fix connection of subports after uniform->constant conversion in visual shader
This commit is contained in:
Rémi Verschelde 2022-05-23 16:21:30 +02:00 committed by GitHub
commit a76db34592
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
scene/resources/visual_shader.cpp
View File

@ -910,6 +910,48 @@ void VisualShader::replace_node(Type p_type, int p_id, const StringName &p_new_c
return;
}
VisualShaderNode *vsn = Object::cast_to<VisualShaderNode>(ClassDB::instantiate(p_new_class));
VisualShaderNode *prev_vsn = g->nodes[p_id].node.ptr();
// Update connection data.
for (int i = 0; i < vsn->get_output_port_count(); i++) {
if (i < prev_vsn->get_output_port_count()) {
if (prev_vsn->is_output_port_connected(i)) {
vsn->set_output_port_connected(i, true);
}
if (prev_vsn->is_output_port_expandable(i) && prev_vsn->_is_output_port_expanded(i) && vsn->is_output_port_expandable(i)) {
vsn->_set_output_port_expanded(i, true);
int component_count = 0;
switch (prev_vsn->get_output_port_type(i)) {
case VisualShaderNode::PORT_TYPE_VECTOR_2D:
component_count = 2;
break;
case VisualShaderNode::PORT_TYPE_VECTOR_3D:
component_count = 3;
break;
case VisualShaderNode::PORT_TYPE_VECTOR_4D:
component_count = 4;
break;
default:
break;
}
for (int j = 0; j < component_count; j++) {
int sub_port = i + 1 + j;
if (prev_vsn->is_output_port_connected(sub_port)) {
vsn->set_output_port_connected(sub_port, true);
}
}
i += component_count;
}
} else {
break;
}
}
vsn->connect("changed", callable_mp(this, &VisualShader::_queue_update));
g->nodes[p_id].node = Ref<VisualShaderNode>(vsn);