maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #53764 from Chaosus/vs_curve_input_port_default

Browse source
This commit is contained in:
Rémi Verschelde 2021-10-15 19:31:05 +02:00 committed by GitHub
parent fe4ca9e4df e270644b20
commit b5ece7c363
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
editor/plugins/visual_shader_editor_plugin.cpp
View file

@ -491,6 +491,35 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) {
bool is_curve = curve.is_valid() || curve_xyz.is_valid();
if (is_curve) {
// a default value handling
{
Variant default_value;
bool port_left_used = false;
for (const VisualShader::Connection &E : connections) {
if (E.to_node == p_id && E.to_port == 0) {
port_left_used = true;
break;
}
}
if (!port_left_used) {
default_value = vsnode->get_input_port_default_value(0);
}
Button *button = memnew(Button);
custom_editor->add_child(button);
register_default_input_button(p_id, 0, button);
custom_editor->move_child(button, 0);
button->connect("pressed", callable_mp(VisualShaderEditor::get_singleton(), &VisualShaderEditor::_edit_port_default_input), varray(button, p_id, 0));
if (default_value.get_type() != Variant::NIL) {
set_input_port_default_value(p_type, p_id, 0, default_value);
} else {
button->hide();
}
}
VisualShaderEditor::get_singleton()->graph->add_child(node);
VisualShaderEditor::get_singleton()->_update_created_node(node);
@ -643,6 +672,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id) {
for (const VisualShader::Connection &E : connections) {
if (E.to_node == p_id && E.to_port == j) {
port_left_used = true;
break;
}
}
}

2
scene/resources/visual_shader_nodes.cpp
View file

@ -918,6 +918,7 @@ bool VisualShaderNodeCurveTexture::is_use_prop_slots() const {
}
VisualShaderNodeCurveTexture::VisualShaderNodeCurveTexture() {
set_input_port_default_value(0, 0.0);
simple_decl = true;
allow_v_resize = false;
}
@ -1002,6 +1003,7 @@ bool VisualShaderNodeCurveXYZTexture::is_use_prop_slots() const {
}
VisualShaderNodeCurveXYZTexture::VisualShaderNodeCurveXYZTexture() {
set_input_port_default_value(0, 0.0);
simple_decl = true;
allow_v_resize = false;
}