summaryrefslogtreecommitdiffstats
path: root/modules/visual_script/visual_script_flow_control.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-05-14 14:29:06 +0200
committerRémi Verschelde <rverschelde@gmail.com>2020-05-14 16:54:55 +0200
commit07bc4e2f96f8f47991339654ff4ab16acc19d44f (patch)
tree43cdc7cfe8239c23065616a931de3769d2db1e86 /modules/visual_script/visual_script_flow_control.cpp
parent0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a (diff)
downloadredot-engine-07bc4e2f96f8f47991339654ff4ab16acc19d44f.tar.gz
Style: Enforce separation line between function definitions
I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
Diffstat (limited to 'modules/visual_script/visual_script_flow_control.cpp')
-rw-r--r--modules/visual_script/visual_script_flow_control.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/modules/visual_script/visual_script_flow_control.cpp b/modules/visual_script/visual_script_flow_control.cpp
index 1f04ea8301..96616c281e 100644
--- a/modules/visual_script/visual_script_flow_control.cpp
+++ b/modules/visual_script/visual_script_flow_control.cpp
@@ -49,6 +49,7 @@ bool VisualScriptReturn::has_input_sequence_port() const {
int VisualScriptReturn::get_input_value_port_count() const {
return with_value ? 1 : 0;
}
+
int VisualScriptReturn::get_output_value_port_count() const {
return 0;
}
@@ -63,6 +64,7 @@ PropertyInfo VisualScriptReturn::get_input_value_port_info(int p_idx) const {
pinfo.type = type;
return pinfo;
}
+
PropertyInfo VisualScriptReturn::get_output_value_port_info(int p_idx) const {
return PropertyInfo();
}
@@ -170,6 +172,7 @@ bool VisualScriptCondition::has_input_sequence_port() const {
int VisualScriptCondition::get_input_value_port_count() const {
return 1;
}
+
int VisualScriptCondition::get_output_value_port_count() const {
return 0;
}
@@ -189,6 +192,7 @@ PropertyInfo VisualScriptCondition::get_input_value_port_info(int p_idx) const {
pinfo.type = Variant::BOOL;
return pinfo;
}
+
PropertyInfo VisualScriptCondition::get_output_value_port_info(int p_idx) const {
return PropertyInfo();
}
@@ -248,6 +252,7 @@ bool VisualScriptWhile::has_input_sequence_port() const {
int VisualScriptWhile::get_input_value_port_count() const {
return 1;
}
+
int VisualScriptWhile::get_output_value_port_count() const {
return 0;
}
@@ -265,6 +270,7 @@ PropertyInfo VisualScriptWhile::get_input_value_port_info(int p_idx) const {
pinfo.type = Variant::BOOL;
return pinfo;
}
+
PropertyInfo VisualScriptWhile::get_output_value_port_info(int p_idx) const {
return PropertyInfo();
}
@@ -305,6 +311,7 @@ VisualScriptNodeInstance *VisualScriptWhile::instance(VisualScriptInstance *p_in
instance->instance = p_instance;
return instance;
}
+
VisualScriptWhile::VisualScriptWhile() {
}
@@ -323,6 +330,7 @@ bool VisualScriptIterator::has_input_sequence_port() const {
int VisualScriptIterator::get_input_value_port_count() const {
return 1;
}
+
int VisualScriptIterator::get_output_value_port_count() const {
return 1;
}
@@ -340,12 +348,14 @@ PropertyInfo VisualScriptIterator::get_input_value_port_info(int p_idx) const {
pinfo.type = Variant::NIL;
return pinfo;
}
+
PropertyInfo VisualScriptIterator::get_output_value_port_info(int p_idx) const {
PropertyInfo pinfo;
pinfo.name = "elem";
pinfo.type = Variant::NIL;
return pinfo;
}
+
String VisualScriptIterator::get_caption() const {
return "Iterator";
}
@@ -441,6 +451,7 @@ bool VisualScriptSequence::has_input_sequence_port() const {
int VisualScriptSequence::get_input_value_port_count() const {
return 0;
}
+
int VisualScriptSequence::get_output_value_port_count() const {
return 1;
}
@@ -452,9 +463,11 @@ String VisualScriptSequence::get_output_sequence_port_text(int p_port) const {
PropertyInfo VisualScriptSequence::get_input_value_port_info(int p_idx) const {
return PropertyInfo();
}
+
PropertyInfo VisualScriptSequence::get_output_value_port_info(int p_idx) const {
return PropertyInfo(Variant::INT, "current");
}
+
String VisualScriptSequence::get_caption() const {
return "Sequence";
}
@@ -518,6 +531,7 @@ VisualScriptNodeInstance *VisualScriptSequence::instance(VisualScriptInstance *p
instance->steps = steps;
return instance;
}
+
VisualScriptSequence::VisualScriptSequence() {
steps = 1;
}
@@ -537,6 +551,7 @@ bool VisualScriptSwitch::has_input_sequence_port() const {
int VisualScriptSwitch::get_input_value_port_count() const {
return case_values.size() + 1;
}
+
int VisualScriptSwitch::get_output_value_port_count() const {
return 0;
}
@@ -636,6 +651,7 @@ bool VisualScriptSwitch::_get(const StringName &p_name, Variant &r_ret) const {
return false;
}
+
void VisualScriptSwitch::_get_property_list(List<PropertyInfo> *p_list) const {
p_list->push_back(PropertyInfo(Variant::INT, "case_count", PROPERTY_HINT_RANGE, "0,128"));
@@ -670,6 +686,7 @@ bool VisualScriptTypeCast::has_input_sequence_port() const {
int VisualScriptTypeCast::get_input_value_port_count() const {
return 1;
}
+
int VisualScriptTypeCast::get_output_value_port_count() const {
return 1;
}
@@ -718,6 +735,7 @@ void VisualScriptTypeCast::set_base_script(const String &p_path) {
_change_notify();
ports_changed_notify();
}
+
String VisualScriptTypeCast::get_base_script() const {
return script;
}