Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Visual shader ports are expandable by default for vector types #73041

Closed
wants to merge 1 commit into from
+4 −41
Closed

Visual shader ports are expandable by default for vector types #73041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scene/resources/visual_shader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,10 @@ bool VisualShaderNode::is_generate_input_var(int p_port) const {
}

bool VisualShaderNode::is_output_port_expandable(int p_port) const {
VisualShaderNode::PortType port = get_output_port_type(p_port);
if (get_output_port_count() == 1 && (port == PORT_TYPE_VECTOR_2D || port == PORT_TYPE_VECTOR_3D || port == PORT_TYPE_VECTOR_4D)) {
return true;
}
return false;
}

Expand Down
35 changes: 0 additions & 35 deletions scene/resources/visual_shader_nodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,13 +377,6 @@ String VisualShaderNodeColorConstant::get_output_port_name(int p_port) const {
return "";
}

bool VisualShaderNodeColorConstant::is_output_port_expandable(int p_port) const {
if (p_port == 0) {
return true;
}
return false;
}

String VisualShaderNodeColorConstant::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 {
return " " + p_output_vars[0] + " = " + vformat("vec4(%.6f, %.6f, %.6f, %.6f)", constant.r, constant.g, constant.b, constant.a) + ";\n";
}
Expand Down Expand Up @@ -730,13 +723,6 @@ String VisualShaderNodeTexture::get_output_port_name(int p_port) const {
}
}

bool VisualShaderNodeTexture::is_output_port_expandable(int p_port) const {
if (p_port == 0) {
return true;
}
return false;
}

bool VisualShaderNodeTexture::is_input_port_default(int p_port, Shader::Mode p_mode) const {
if (p_mode == Shader::MODE_CANVAS_ITEM || p_mode == Shader::MODE_SPATIAL) {
if (p_port == 0) {
Expand Down Expand Up @@ -1269,13 +1255,6 @@ String VisualShaderNodeSample3D::get_output_port_name(int p_port) const {
return "color";
}

bool VisualShaderNodeSample3D::is_output_port_expandable(int p_port) const {
if (p_port == 0) {
return true;
}
return false;
}

bool VisualShaderNodeSample3D::is_input_port_default(int p_port, Shader::Mode p_mode) const {
if (p_mode == Shader::MODE_CANVAS_ITEM || p_mode == Shader::MODE_SPATIAL) {
if (p_port == 0) {
Expand Down Expand Up @@ -1510,13 +1489,6 @@ String VisualShaderNodeCubemap::get_output_port_name(int p_port) const {
return "color";
}

bool VisualShaderNodeCubemap::is_output_port_expandable(int p_port) const {
if (p_port == 0) {
return true;
}
return false;
}

Vector<VisualShader::DefaultTextureParam> VisualShaderNodeCubemap::get_default_texture_parameters(VisualShader::Type p_type, int p_id) const {
VisualShader::DefaultTextureParam dtp;
dtp.name = make_unique_id(p_type, p_id, "cube");
Expand Down Expand Up @@ -5669,13 +5641,6 @@ String VisualShaderNodeColorParameter::get_output_port_name(int p_port) const {
return "color";
}

bool VisualShaderNodeColorParameter::is_output_port_expandable(int p_port) const {
if (p_port == 0) {
return true;
}
return false;
}

void VisualShaderNodeColorParameter::set_default_value_enabled(bool p_enabled) {
if (default_value_enabled == p_enabled) {
return;
Expand Down
6 changes: 0 additions & 6 deletions scene/resources/visual_shader_nodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ class VisualShaderNodeColorConstant : public VisualShaderNodeConstant {
virtual int get_output_port_count() const override;
virtual PortType get_output_port_type(int p_port) const override;
virtual String get_output_port_name(int p_port) const override;
virtual bool is_output_port_expandable(int p_port) const override;

virtual String 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 = false) const override;

Expand Down Expand Up @@ -414,7 +413,6 @@ class VisualShaderNodeTexture : public VisualShaderNode {
virtual int get_output_port_count() const override;
virtual PortType get_output_port_type(int p_port) const override;
virtual String get_output_port_name(int p_port) const override;
virtual bool is_output_port_expandable(int p_port) const override;

virtual bool is_input_port_default(int p_port, Shader::Mode p_mode) const override;

Expand Down Expand Up @@ -533,7 +531,6 @@ class VisualShaderNodeSample3D : public VisualShaderNode {
virtual int get_output_port_count() const override;
virtual PortType get_output_port_type(int p_port) const override;
virtual String get_output_port_name(int p_port) const override;
virtual bool is_output_port_expandable(int p_port) const override;

virtual String 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 = false) const override;

Expand Down Expand Up @@ -629,7 +626,6 @@ class VisualShaderNodeCubemap : public VisualShaderNode {
virtual int get_output_port_count() const override;
virtual PortType get_output_port_type(int p_port) const override;
virtual String get_output_port_name(int p_port) const override;
virtual bool is_output_port_expandable(int p_port) const override;

virtual Vector<VisualShader::DefaultTextureParam> get_default_texture_parameters(VisualShader::Type p_type, int p_id) const override;
virtual String generate_global(Shader::Mode p_mode, VisualShader::Type p_type, int p_id) const override;
Expand Down Expand Up @@ -2146,8 +2142,6 @@ class VisualShaderNodeColorParameter : public VisualShaderNodeParameter {
virtual PortType get_output_port_type(int p_port) const override;
virtual String get_output_port_name(int p_port) const override;

bool is_output_port_expandable(int p_port) const override;

virtual String generate_global(Shader::Mode p_mode, VisualShader::Type p_type, int p_id) const override;
virtual String 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 = false) const override;

Expand Down