You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-12-04 17:04:49 +00:00
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.
This commit is contained in:
@@ -83,21 +83,27 @@ NavigationServer2D *NavigationServer2D::singleton = nullptr;
|
||||
static RID rid_to_rid(const RID d) {
|
||||
return d;
|
||||
}
|
||||
|
||||
static bool bool_to_bool(const bool d) {
|
||||
return d;
|
||||
}
|
||||
|
||||
static int int_to_int(const int d) {
|
||||
return d;
|
||||
}
|
||||
|
||||
static real_t real_to_real(const real_t d) {
|
||||
return d;
|
||||
}
|
||||
|
||||
static Vector3 v2_to_v3(const Vector2 d) {
|
||||
return Vector3(d.x, 0.0, d.y);
|
||||
}
|
||||
|
||||
static Vector2 v3_to_v2(const Vector3 &d) {
|
||||
return Vector2(d.x, d.z);
|
||||
}
|
||||
|
||||
static Vector<Vector2> vector_v3_to_v2(const Vector<Vector3> &d) {
|
||||
Vector<Vector2> nd;
|
||||
nd.resize(d.size());
|
||||
@@ -106,21 +112,26 @@ static Vector<Vector2> vector_v3_to_v2(const Vector<Vector3> &d) {
|
||||
}
|
||||
return nd;
|
||||
}
|
||||
|
||||
static Transform trf2_to_trf3(const Transform2D &d) {
|
||||
Vector3 o(v2_to_v3(d.get_origin()));
|
||||
Basis b;
|
||||
b.rotate(Vector3(0, 1, 0), d.get_rotation());
|
||||
return Transform(b, o);
|
||||
}
|
||||
|
||||
static Object *obj_to_obj(Object *d) {
|
||||
return d;
|
||||
}
|
||||
|
||||
static StringName sn_to_sn(StringName &d) {
|
||||
return d;
|
||||
}
|
||||
|
||||
static Variant var_to_var(Variant &d) {
|
||||
return d;
|
||||
}
|
||||
|
||||
static Ref<NavigationMesh> poly_to_mesh(Ref<NavigationPolygon> d) {
|
||||
if (d.is_valid()) {
|
||||
return d->get_mesh();
|
||||
|
||||
Reference in New Issue
Block a user