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

Merge pull request #41843 from Chaosus/vs_fix_some_nodes

Browse Source 
Fix some broken visual shader nodes
This commit is contained in:
Rémi Verschelde 2020-09-07 12:31:38 +02:00 committed by GitHub
commit 365dbde25d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/resources/visual_shader.cpp
View File

@ -172,8 +172,6 @@ void VisualShaderNode::_bind_methods() {
}
VisualShaderNode::VisualShaderNode() {
port_preview = -1;
simple_decl = true;
}
/////////////////////////////////////////////////////////
@ -2951,6 +2949,7 @@ String VisualShaderNodeGroupBase::generate_code(Shader::Mode p_mode, VisualShade
}
VisualShaderNodeGroupBase::VisualShaderNodeGroupBase() {
simple_decl = false;
}
////////////// Expression

4
scene/resources/visual_shader.h
View File

@ -180,7 +180,7 @@ VARIANT_ENUM_CAST(VisualShader::Type)
class VisualShaderNode : public Resource {
GDCLASS(VisualShaderNode, Resource);
int port_preview;
int port_preview = -1;
Map<int, Variant> default_input_values;
Map<int, bool> connected_input_ports;
@ -188,7 +188,7 @@ class VisualShaderNode : public Resource {
int connected_output_count = 0;
protected:
bool simple_decl = false;
bool simple_decl = true;
static void _bind_methods();
public:

6
scene/resources/visual_shader_nodes.cpp
View File

@ -892,6 +892,7 @@ String VisualShaderNodeSample3D::get_warning(Shader::Mode p_mode, VisualShader::
}
VisualShaderNodeSample3D::VisualShaderNodeSample3D() {
simple_decl = false;
}
////////////// Texture2DArray
@ -1135,6 +1136,7 @@ void VisualShaderNodeCubemap::_bind_methods() {
}
VisualShaderNodeCubemap::VisualShaderNodeCubemap() {
simple_decl = false;
}
////////////// Float Op
@ -2236,6 +2238,7 @@ void VisualShaderNodeColorFunc::_bind_methods() {
}
VisualShaderNodeColorFunc::VisualShaderNodeColorFunc() {
simple_decl = false;
set_input_port_default_value(0, Vector3());
}
@ -4226,6 +4229,7 @@ bool VisualShaderNodeTextureUniform::is_qualifier_supported(Qualifier p_qual) co
}
VisualShaderNodeTextureUniform::VisualShaderNodeTextureUniform() {
simple_decl = false;
}
////////////// Texture Uniform (Triplanar)
@ -4529,6 +4533,7 @@ String VisualShaderNodeIf::generate_code(Shader::Mode p_mode, VisualShader::Type
}
VisualShaderNodeIf::VisualShaderNodeIf() {
simple_decl = false;
set_input_port_default_value(0, 0.0);
set_input_port_default_value(1, 0.0);
set_input_port_default_value(2, CMP_EPSILON);
@ -4593,6 +4598,7 @@ String VisualShaderNodeSwitch::generate_code(Shader::Mode p_mode, VisualShader::
}
VisualShaderNodeSwitch::VisualShaderNodeSwitch() {
simple_decl = false;
set_input_port_default_value(0, false);
set_input_port_default_value(1, Vector3(1.0, 1.0, 1.0));
set_input_port_default_value(2, Vector3(0.0, 0.0, 0.0));