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

Style: Enforce braces around if blocks and loops

Browse Source 
Using clang-tidy's `readability-braces-around-statements`.
https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
This commit is contained in:
Rémi Verschelde
2021-05-05 12:44:11 +02:00
parent b8d198eeed
commit 140350d767
694 changed files with 23283 additions and 12499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
scene/resources/visual_shader_nodes.cpp
View File

@@ -381,14 +381,16 @@ int VisualShaderNodeTexture::get_output_port_count() const {
}
VisualShaderNodeTexture::PortType VisualShaderNodeTexture::get_output_port_type(int p_port) const {
if (p_port == 0 && source == SOURCE_DEPTH)
if (p_port == 0 && source == SOURCE_DEPTH) {
return PORT_TYPE_SCALAR;
}
return p_port == 0 ? PORT_TYPE_VECTOR : PORT_TYPE_SCALAR;
}
String VisualShaderNodeTexture::get_output_port_name(int p_port) const {
if (p_port == 0 && source == SOURCE_DEPTH)
if (p_port == 0 && source == SOURCE_DEPTH) {
return "depth";
}
return p_port == 0 ? "rgb" : "alpha";
}
@@ -2190,12 +2192,13 @@ VisualShaderNodeScalarClamp::PortType VisualShaderNodeScalarClamp::get_input_por
}
String VisualShaderNodeScalarClamp::get_input_port_name(int p_port) const {
if (p_port == 0)
if (p_port == 0) {
return "";
else if (p_port == 1)
} else if (p_port == 1) {
return "min";
else if (p_port == 2)
} else if (p_port == 2) {
return "max";
}
return "";
}
@@ -2236,12 +2239,13 @@ VisualShaderNodeVectorClamp::PortType VisualShaderNodeVectorClamp::get_input_por
}
String VisualShaderNodeVectorClamp::get_input_port_name(int p_port) const {
if (p_port == 0)
if (p_port == 0) {
return "";
else if (p_port == 1)
} else if (p_port == 1) {
return "min";
else if (p_port == 2)
} else if (p_port == 2) {
return "max";
}
return "";
}
@@ -2380,10 +2384,11 @@ VisualShaderNodeVectorScalarStep::PortType VisualShaderNodeVectorScalarStep::get
}
String VisualShaderNodeVectorScalarStep::get_input_port_name(int p_port) const {
if (p_port == 0)
if (p_port == 0) {
return "edge";
else if (p_port == 1)
} else if (p_port == 1) {
return "x";
}
return "";
}
@@ -2423,12 +2428,13 @@ VisualShaderNodeScalarSmoothStep::PortType VisualShaderNodeScalarSmoothStep::get
}
String VisualShaderNodeScalarSmoothStep::get_input_port_name(int p_port) const {
if (p_port == 0)
if (p_port == 0) {
return "edge0";
else if (p_port == 1)
} else if (p_port == 1) {
return "edge1";
else if (p_port == 2)
} else if (p_port == 2) {
return "x";
}
return "";
}
@@ -2469,12 +2475,13 @@ VisualShaderNodeVectorSmoothStep::PortType VisualShaderNodeVectorSmoothStep::get
}
String VisualShaderNodeVectorSmoothStep::get_input_port_name(int p_port) const {
if (p_port == 0)
if (p_port == 0) {
return "edge0";
else if (p_port == 1)
} else if (p_port == 1) {
return "edge1";
else if (p_port == 2)
} else if (p_port == 2) {
return "x";
}
return "";
}
@@ -2520,12 +2527,13 @@ VisualShaderNodeVectorScalarSmoothStep::PortType VisualShaderNodeVectorScalarSmo
}
String VisualShaderNodeVectorScalarSmoothStep::get_input_port_name(int p_port) const {
if (p_port == 0)
if (p_port == 0) {
return "edge0";
else if (p_port == 1)
} else if (p_port == 1) {
return "edge1";
else if (p_port == 2)
} else if (p_port == 2) {
return "x";
}
return "";
}
@@ -2749,8 +2757,9 @@ int VisualShaderNodeVectorScalarMix::get_input_port_count() const {
}
VisualShaderNodeVectorScalarMix::PortType VisualShaderNodeVectorScalarMix::get_input_port_type(int p_port) const {
if (p_port == 2)
if (p_port == 2) {
return PORT_TYPE_SCALAR;
}
return PORT_TYPE_VECTOR;
}
@@ -3243,16 +3252,18 @@ String VisualShaderNodeTextureUniform::generate_global(Shader::Mode p_mode, Visu
switch (texture_type) {
case TYPE_DATA:
if (color_default == COLOR_DEFAULT_BLACK)
if (color_default == COLOR_DEFAULT_BLACK) {
code += " : hint_black;\n";
else
} else {
code += ";\n";
}
break;
case TYPE_COLOR:
if (color_default == COLOR_DEFAULT_BLACK)
if (color_default == COLOR_DEFAULT_BLACK) {
code += " : hint_black_albedo;\n";
else
} else {
code += " : hint_albedo;\n";
}
break;
case TYPE_NORMALMAP:
code += " : hint_normal;\n";
@@ -3480,16 +3491,18 @@ String VisualShaderNodeCubeMapUniform::generate_global(Shader::Mode p_mode, Visu
switch (texture_type) {
case TYPE_DATA:
if (color_default == COLOR_DEFAULT_BLACK)
if (color_default == COLOR_DEFAULT_BLACK) {
code += " : hint_black;\n";
else
} else {
code += ";\n";
}
break;
case TYPE_COLOR:
if (color_default == COLOR_DEFAULT_BLACK)
if (color_default == COLOR_DEFAULT_BLACK) {
code += " : hint_black_albedo;\n";
else
} else {
code += " : hint_albedo;\n";
}
break;
case TYPE_NORMALMAP:
code += " : hint_normal;\n";
@@ -3852,8 +3865,9 @@ int VisualShaderNodeCompare::get_input_port_count() const {
}
VisualShaderNodeCompare::PortType VisualShaderNodeCompare::get_input_port_type(int p_port) const {
if (p_port == 2)
if (p_port == 2) {
return PORT_TYPE_SCALAR;
}
switch (ctype) {
case CTYPE_SCALAR:
return PORT_TYPE_SCALAR;
@@ -3868,12 +3882,13 @@ VisualShaderNodeCompare::PortType VisualShaderNodeCompare::get_input_port_type(i
}
String VisualShaderNodeCompare::get_input_port_name(int p_port) const {
if (p_port == 0)
if (p_port == 0) {
return "a";
else if (p_port == 1)
} else if (p_port == 1) {
return "b";
else if (p_port == 2)
} else if (p_port == 2) {
return "tolerance";
}
return "";
}
@@ -3886,8 +3901,9 @@ VisualShaderNodeCompare::PortType VisualShaderNodeCompare::get_output_port_type(
}
String VisualShaderNodeCompare::get_output_port_name(int p_port) const {
if (p_port == 0)
if (p_port == 0) {
return "result";
}
return "";
}
@@ -3945,14 +3961,16 @@ String VisualShaderNodeCompare::generate_code(Shader::Mode p_mode, VisualShader:
break;
case CTYPE_BOOLEAN:
if (func > FUNC_NOT_EQUAL)
if (func > FUNC_NOT_EQUAL) {
return "\t" + p_output_vars[0] + " = false;\n";
}
code += "\t" + p_output_vars[0] + " = " + (p_input_vars[0] + " $ " + p_input_vars[1]).replace("$", ops[func]) + ";\n";
break;
case CTYPE_TRANSFORM:
if (func > FUNC_NOT_EQUAL)
if (func > FUNC_NOT_EQUAL) {
return "\t" + p_output_vars[0] + " = false;\n";
}
code += "\t" + p_output_vars[0] + " = " + (p_input_vars[0] + " $ " + p_input_vars[1]).replace("$", ops[func]) + ";\n";
break;
@@ -4016,8 +4034,9 @@ Vector<StringName> VisualShaderNodeCompare::get_editable_properties() const {
Vector<StringName> props;
props.push_back("type");
props.push_back("function");
if (ctype == CTYPE_VECTOR)
if (ctype == CTYPE_VECTOR) {
props.push_back("condition");
}
return props;
}