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

Fix some broken visual shader nodes

Browse Source
This commit is contained in:
Yuri Roubinsky 2020-09-07 12:29:44 +03:00
parent 753b2bd010
commit e2aca7e047
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() { VisualShaderNode::VisualShaderNode() {
port_preview = -1;
simple_decl = true;
} }
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
@ -2951,6 +2949,7 @@ String VisualShaderNodeGroupBase::generate_code(Shader::Mode p_mode, VisualShade
} }
VisualShaderNodeGroupBase::VisualShaderNodeGroupBase() { VisualShaderNodeGroupBase::VisualShaderNodeGroupBase() {
simple_decl = false;
} }
////////////// Expression ////////////// Expression

4
scene/resources/visual_shader.h
View File

@ -180,7 +180,7 @@ VARIANT_ENUM_CAST(VisualShader::Type)
class VisualShaderNode : public Resource { class VisualShaderNode : public Resource {
GDCLASS(VisualShaderNode, Resource); GDCLASS(VisualShaderNode, Resource);
int port_preview; int port_preview = -1;
Map<int, Variant> default_input_values; Map<int, Variant> default_input_values;
Map<int, bool> connected_input_ports; Map<int, bool> connected_input_ports;
@ -188,7 +188,7 @@ class VisualShaderNode : public Resource {
int connected_output_count = 0; int connected_output_count = 0;
protected: protected:
bool simple_decl = false; bool simple_decl = true;
static void _bind_methods(); static void _bind_methods();
public: 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() { VisualShaderNodeSample3D::VisualShaderNodeSample3D() {
simple_decl = false;
} }
////////////// Texture2DArray ////////////// Texture2DArray
@ -1135,6 +1136,7 @@ void VisualShaderNodeCubemap::_bind_methods() {
} }
VisualShaderNodeCubemap::VisualShaderNodeCubemap() { VisualShaderNodeCubemap::VisualShaderNodeCubemap() {
simple_decl = false;
} }
////////////// Float Op ////////////// Float Op
@ -2236,6 +2238,7 @@ void VisualShaderNodeColorFunc::_bind_methods() {
} }
VisualShaderNodeColorFunc::VisualShaderNodeColorFunc() { VisualShaderNodeColorFunc::VisualShaderNodeColorFunc() {
simple_decl = false;
set_input_port_default_value(0, Vector3()); set_input_port_default_value(0, Vector3());
} }
@ -4226,6 +4229,7 @@ bool VisualShaderNodeTextureUniform::is_qualifier_supported(Qualifier p_qual) co
} }
VisualShaderNodeTextureUniform::VisualShaderNodeTextureUniform() { VisualShaderNodeTextureUniform::VisualShaderNodeTextureUniform() {
simple_decl = false;
} }
////////////// Texture Uniform (Triplanar) ////////////// Texture Uniform (Triplanar)
@ -4529,6 +4533,7 @@ String VisualShaderNodeIf::generate_code(Shader::Mode p_mode, VisualShader::Type
} }
VisualShaderNodeIf::VisualShaderNodeIf() { VisualShaderNodeIf::VisualShaderNodeIf() {
simple_decl = false;
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, 0.0);
set_input_port_default_value(2, CMP_EPSILON); set_input_port_default_value(2, CMP_EPSILON);
@ -4593,6 +4598,7 @@ String VisualShaderNodeSwitch::generate_code(Shader::Mode p_mode, VisualShader::
} }
VisualShaderNodeSwitch::VisualShaderNodeSwitch() { VisualShaderNodeSwitch::VisualShaderNodeSwitch() {
simple_decl = false;
set_input_port_default_value(0, 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(1, Vector3(1.0, 1.0, 1.0));
set_input_port_default_value(2, Vector3(0.0, 0.0, 0.0)); set_input_port_default_value(2, Vector3(0.0, 0.0, 0.0));