godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Merge pull request #46539 from Chaosus/vs_fix_return

Browse Source 
Removes redundant code from get_input/output_port_type (visual shaders)
This commit is contained in:
Rémi Verschelde
2021-03-01 09:44:20 +01:00
committed by GitHub
parent d9c7dd910f 9aca12a1af
commit 1eaa89a008
1 changed files with 11 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
scene/resources/visual_shader_nodes.cpp
View File

@@ -2742,8 +2742,6 @@ int VisualShaderNodeClamp::get_input_port_count() const {
VisualShaderNodeClamp::PortType VisualShaderNodeClamp::get_input_port_type(int p_port) const { VisualShaderNodeClamp::PortType VisualShaderNodeClamp::get_input_port_type(int p_port) const {
switch (op_type) { switch (op_type) {
case OP_TYPE_FLOAT:
return PORT_TYPE_SCALAR;
case OP_TYPE_INT: case OP_TYPE_INT:
return PORT_TYPE_SCALAR_INT; return PORT_TYPE_SCALAR_INT;
case OP_TYPE_VECTOR: case OP_TYPE_VECTOR:
@@ -2771,8 +2769,6 @@ int VisualShaderNodeClamp::get_output_port_count() const {
VisualShaderNodeClamp::PortType VisualShaderNodeClamp::get_output_port_type(int p_port) const { VisualShaderNodeClamp::PortType VisualShaderNodeClamp::get_output_port_type(int p_port) const {
switch (op_type) { switch (op_type) {
case OP_TYPE_FLOAT:
return PORT_TYPE_SCALAR;
case OP_TYPE_INT: case OP_TYPE_INT:
return PORT_TYPE_SCALAR_INT; return PORT_TYPE_SCALAR_INT;
case OP_TYPE_VECTOR: case OP_TYPE_VECTOR:
@@ -2954,18 +2950,11 @@ int VisualShaderNodeStep::get_input_port_count() const {
VisualShaderNodeStep::PortType VisualShaderNodeStep::get_input_port_type(int p_port) const { VisualShaderNodeStep::PortType VisualShaderNodeStep::get_input_port_type(int p_port) const {
switch (op_type) { switch (op_type) {
case OP_TYPE_SCALAR:
return PORT_TYPE_SCALAR;
case OP_TYPE_VECTOR: case OP_TYPE_VECTOR:
return PORT_TYPE_VECTOR; return PORT_TYPE_VECTOR;
case OP_TYPE_VECTOR_SCALAR: case OP_TYPE_VECTOR_SCALAR:
switch (p_port) { if (p_port == 1) {
case 0:
return PORT_TYPE_SCALAR;
case 1:
return PORT_TYPE_VECTOR; return PORT_TYPE_VECTOR;
default:
break;
} }
break; break;
default: default:
@@ -2989,8 +2978,6 @@ int VisualShaderNodeStep::get_output_port_count() const {
VisualShaderNodeStep::PortType VisualShaderNodeStep::get_output_port_type(int p_port) const { VisualShaderNodeStep::PortType VisualShaderNodeStep::get_output_port_type(int p_port) const {
switch (op_type) { switch (op_type) {
case OP_TYPE_SCALAR:
return PORT_TYPE_SCALAR;
case OP_TYPE_VECTOR: case OP_TYPE_VECTOR:
return PORT_TYPE_VECTOR; return PORT_TYPE_VECTOR;
case OP_TYPE_VECTOR_SCALAR: case OP_TYPE_VECTOR_SCALAR:
@@ -3085,20 +3072,11 @@ int VisualShaderNodeSmoothStep::get_input_port_count() const {
VisualShaderNodeSmoothStep::PortType VisualShaderNodeSmoothStep::get_input_port_type(int p_port) const { VisualShaderNodeSmoothStep::PortType VisualShaderNodeSmoothStep::get_input_port_type(int p_port) const {
switch (op_type) { switch (op_type) {
case OP_TYPE_SCALAR:
return PORT_TYPE_SCALAR;
case OP_TYPE_VECTOR: case OP_TYPE_VECTOR:
return PORT_TYPE_VECTOR; return PORT_TYPE_VECTOR;
case OP_TYPE_VECTOR_SCALAR: case OP_TYPE_VECTOR_SCALAR:
switch (p_port) { if (p_port == 2) {
case 0:
return PORT_TYPE_SCALAR; // edge0
case 1:
return PORT_TYPE_SCALAR; // edge1
case 2:
return PORT_TYPE_VECTOR; // x return PORT_TYPE_VECTOR; // x
default:
break;
} }
break; break;
default: default:
@@ -3124,8 +3102,6 @@ int VisualShaderNodeSmoothStep::get_output_port_count() const {
VisualShaderNodeSmoothStep::PortType VisualShaderNodeSmoothStep::get_output_port_type(int p_port) const { VisualShaderNodeSmoothStep::PortType VisualShaderNodeSmoothStep::get_output_port_type(int p_port) const {
switch (op_type) { switch (op_type) {
case OP_TYPE_SCALAR:
return PORT_TYPE_SCALAR;
case OP_TYPE_VECTOR: case OP_TYPE_VECTOR:
return PORT_TYPE_VECTOR; return PORT_TYPE_VECTOR;
case OP_TYPE_VECTOR_SCALAR: case OP_TYPE_VECTOR_SCALAR:
@@ -3319,16 +3295,11 @@ int VisualShaderNodeMix::get_input_port_count() const {
VisualShaderNodeMix::PortType VisualShaderNodeMix::get_input_port_type(int p_port) const { VisualShaderNodeMix::PortType VisualShaderNodeMix::get_input_port_type(int p_port) const {
switch (op_type) { switch (op_type) {
case OP_TYPE_SCALAR:
return PORT_TYPE_SCALAR;
case OP_TYPE_VECTOR: case OP_TYPE_VECTOR:
if (p_port == 2) {
return PORT_TYPE_VECTOR;
}
return PORT_TYPE_VECTOR; return PORT_TYPE_VECTOR;
case OP_TYPE_VECTOR_SCALAR: case OP_TYPE_VECTOR_SCALAR:
if (p_port == 2) { if (p_port == 2) {
return PORT_TYPE_SCALAR; break;
} }
return PORT_TYPE_VECTOR; return PORT_TYPE_VECTOR;
default: default:
@@ -3353,8 +3324,6 @@ int VisualShaderNodeMix::get_output_port_count() const {
VisualShaderNodeMix::PortType VisualShaderNodeMix::get_output_port_type(int p_port) const { VisualShaderNodeMix::PortType VisualShaderNodeMix::get_output_port_type(int p_port) const {
switch (op_type) { switch (op_type) {
case OP_TYPE_SCALAR:
return PORT_TYPE_SCALAR;
case OP_TYPE_VECTOR: case OP_TYPE_VECTOR:
return PORT_TYPE_VECTOR; return PORT_TYPE_VECTOR;
case OP_TYPE_VECTOR_SCALAR: case OP_TYPE_VECTOR_SCALAR:
@@ -4540,9 +4509,7 @@ int VisualShaderNodeTextureUniformTriplanar::get_input_port_count() const {
} }
VisualShaderNodeTextureUniform::PortType VisualShaderNodeTextureUniformTriplanar::get_input_port_type(int p_port) const { VisualShaderNodeTextureUniform::PortType VisualShaderNodeTextureUniformTriplanar::get_input_port_type(int p_port) const {
if (p_port == 0) { if (p_port == 0 || p_port == 1) {
return PORT_TYPE_VECTOR;
} else if (p_port == 1) {
return PORT_TYPE_VECTOR; return PORT_TYPE_VECTOR;
} }
return PORT_TYPE_SCALAR; return PORT_TYPE_SCALAR;
@@ -4923,8 +4890,6 @@ VisualShaderNodeSwitch::PortType VisualShaderNodeSwitch::get_input_port_type(int
} }
if (p_port == 1 || p_port == 2) { if (p_port == 1 || p_port == 2) {
switch (op_type) { switch (op_type) {
case OP_TYPE_FLOAT:
return PORT_TYPE_SCALAR;
case OP_TYPE_INT: case OP_TYPE_INT:
return PORT_TYPE_SCALAR_INT; return PORT_TYPE_SCALAR_INT;
case OP_TYPE_VECTOR: case OP_TYPE_VECTOR:
@@ -4959,8 +4924,6 @@ int VisualShaderNodeSwitch::get_output_port_count() const {
VisualShaderNodeSwitch::PortType VisualShaderNodeSwitch::get_output_port_type(int p_port) const { VisualShaderNodeSwitch::PortType VisualShaderNodeSwitch::get_output_port_type(int p_port) const {
switch (op_type) { switch (op_type) {
case OP_TYPE_FLOAT:
return PORT_TYPE_SCALAR;
case OP_TYPE_INT: case OP_TYPE_INT:
return PORT_TYPE_SCALAR_INT; return PORT_TYPE_SCALAR_INT;
case OP_TYPE_VECTOR: case OP_TYPE_VECTOR:
@@ -5238,9 +5201,6 @@ int VisualShaderNodeCompare::get_input_port_count() const {
} }
VisualShaderNodeCompare::PortType VisualShaderNodeCompare::get_input_port_type(int p_port) const { VisualShaderNodeCompare::PortType VisualShaderNodeCompare::get_input_port_type(int p_port) const {
if (p_port == 2) {
return PORT_TYPE_SCALAR;
}
switch (ctype) { switch (ctype) {
case CTYPE_SCALAR: case CTYPE_SCALAR:
return PORT_TYPE_SCALAR; return PORT_TYPE_SCALAR;
@@ -5252,8 +5212,9 @@ VisualShaderNodeCompare::PortType VisualShaderNodeCompare::get_input_port_type(i
return PORT_TYPE_BOOLEAN; return PORT_TYPE_BOOLEAN;
case CTYPE_TRANSFORM: case CTYPE_TRANSFORM:
return PORT_TYPE_TRANSFORM; return PORT_TYPE_TRANSFORM;
default:
return PORT_TYPE_SCALAR;
} }
return PORT_TYPE_VECTOR;
} }
String VisualShaderNodeCompare::get_input_port_name(int p_port) const { String VisualShaderNodeCompare::get_input_port_name(int p_port) const {
@@ -5472,11 +5433,11 @@ int VisualShaderNodeMultiplyAdd::get_input_port_count() const {
} }
VisualShaderNodeMultiplyAdd::PortType VisualShaderNodeMultiplyAdd::get_input_port_type(int p_port) const { VisualShaderNodeMultiplyAdd::PortType VisualShaderNodeMultiplyAdd::get_input_port_type(int p_port) const {
if (op_type == OP_TYPE_SCALAR) { if (op_type == OP_TYPE_VECTOR) {
return PORT_TYPE_SCALAR;
}
return PORT_TYPE_VECTOR; return PORT_TYPE_VECTOR;
} }
return PORT_TYPE_SCALAR;
}
String VisualShaderNodeMultiplyAdd::get_input_port_name(int p_port) const { String VisualShaderNodeMultiplyAdd::get_input_port_name(int p_port) const {
if (p_port == 0) { if (p_port == 0) {