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

Merge pull request #63999 from QbieShay/qbie/vs-qol 

Quality of life visual shaders updates
This commit is contained in:
Clay John 2022-08-18 14:47:23 -06:00 committed by GitHub
parent de083c8f63 ecbeb8de1b
commit 547e64d226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/resources/visual_shader.cpp
View File

@ -1698,13 +1698,13 @@ Error VisualShader::_write_node(Type type, StringBuilder *global_code, StringBui
inputs[i] = "(" + src_var + " ? 1.0 : 0.0)"; inputs[i] = "(" + src_var + " ? 1.0 : 0.0)";
} break; } break;
case VisualShaderNode::PORT_TYPE_VECTOR_2D: { case VisualShaderNode::PORT_TYPE_VECTOR_2D: {
inputs[i] = "dot(" + src_var + ", vec2(0.5, 0.5))"; inputs[i] = src_var + ".x";
} break; } break;
case VisualShaderNode::PORT_TYPE_VECTOR_3D: { case VisualShaderNode::PORT_TYPE_VECTOR_3D: {
inputs[i] = "dot(" + src_var + ", vec3(0.333333, 0.333333, 0.333333))"; inputs[i] = src_var + ".x";
} break; } break;
case VisualShaderNode::PORT_TYPE_VECTOR_4D: { case VisualShaderNode::PORT_TYPE_VECTOR_4D: {
inputs[i] = "dot(" + src_var + ", vec4(0.25, 0.25, 0.25, 0.25))"; inputs[i] = src_var + ".x";
} break; } break;
default: default:
break; break;

16
scene/resources/visual_shader_nodes.cpp
View File

@ -1015,7 +1015,7 @@ Vector<StringName> VisualShaderNodeCurveTexture::get_editable_properties() const
} }
String VisualShaderNodeCurveTexture::generate_global(Shader::Mode p_mode, VisualShader::Type p_type, int p_id) const { String VisualShaderNodeCurveTexture::generate_global(Shader::Mode p_mode, VisualShader::Type p_type, int p_id) const {
return "uniform sampler2D " + make_unique_id(p_type, p_id, "curve") + ";\n"; return "uniform sampler2D " + make_unique_id(p_type, p_id, "curve") + " : repeat_disable;\n";
} }
String VisualShaderNodeCurveTexture::generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview) const { String VisualShaderNodeCurveTexture::generate_code(Shader::Mode p_mode, VisualShader::Type p_type, int p_id, const String *p_input_vars, const String *p_output_vars, bool p_for_preview) const {
@ -6830,23 +6830,23 @@ void VisualShaderNodeMultiplyAdd::set_op_type(OpType p_op_type) {
switch (p_op_type) { switch (p_op_type) {
case OP_TYPE_SCALAR: { case OP_TYPE_SCALAR: {
set_input_port_default_value(0, 0.0, get_input_port_default_value(0)); set_input_port_default_value(0, 0.0, get_input_port_default_value(0));
set_input_port_default_value(1, 0.0, get_input_port_default_value(1)); set_input_port_default_value(1, 1.0, get_input_port_default_value(1));
set_input_port_default_value(2, 0.0, get_input_port_default_value(2)); set_input_port_default_value(2, 0.0, get_input_port_default_value(2));
} break; } break;
case OP_TYPE_VECTOR_2D: { case OP_TYPE_VECTOR_2D: {
set_input_port_default_value(0, Vector2(), get_input_port_default_value(0)); set_input_port_default_value(0, Vector2(), get_input_port_default_value(0));
set_input_port_default_value(1, Vector2(), get_input_port_default_value(1)); set_input_port_default_value(1, Vector2(1.0, 1.0), get_input_port_default_value(1));
set_input_port_default_value(2, Vector2(), get_input_port_default_value(2)); set_input_port_default_value(2, Vector2(), get_input_port_default_value(2));
} break; } break;
case OP_TYPE_VECTOR_3D: { case OP_TYPE_VECTOR_3D: {
set_input_port_default_value(0, Vector3(), get_input_port_default_value(0)); set_input_port_default_value(0, Vector3(), get_input_port_default_value(0));
set_input_port_default_value(1, Vector3(), get_input_port_default_value(1)); set_input_port_default_value(1, Vector3(1.0, 1.0, 1.0), get_input_port_default_value(1));
set_input_port_default_value(2, Vector3(), get_input_port_default_value(2)); set_input_port_default_value(2, Vector3(), get_input_port_default_value(2));
} break; } break;
case OP_TYPE_VECTOR_4D: { case OP_TYPE_VECTOR_4D: {
set_input_port_default_value(0, Quaternion(), get_input_port_default_value(0)); set_input_port_default_value(0, Vector4(), get_input_port_default_value(0));
set_input_port_default_value(1, Quaternion(), get_input_port_default_value(1)); set_input_port_default_value(1, Vector4(1.0, 1.0, 1.0, 1.0), get_input_port_default_value(1));
set_input_port_default_value(2, Quaternion(), get_input_port_default_value(2)); set_input_port_default_value(2, Vector4(), get_input_port_default_value(2));
} break; } break;
default: default:
break; break;
@ -6880,7 +6880,7 @@ void VisualShaderNodeMultiplyAdd::_bind_methods() {
VisualShaderNodeMultiplyAdd::VisualShaderNodeMultiplyAdd() { VisualShaderNodeMultiplyAdd::VisualShaderNodeMultiplyAdd() {
set_input_port_default_value(0, 0.0); set_input_port_default_value(0, 0.0);
set_input_port_default_value(1, 0.0); set_input_port_default_value(1, 1.0);
set_input_port_default_value(2, 0.0); set_input_port_default_value(2, 0.0);
} }