hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style: Enforce separation line between function definitions

Browse source 
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:
Rémi Verschelde 2020-05-14 14:29:06 +02:00
parent 0be6d925dc
commit 07bc4e2f96
409 changed files with 2286 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scene/3d/ray_cast_3d.cpp
View file

@ -71,6 +71,7 @@ bool RayCast3D::get_collision_mask_bit(int p_bit) const {
bool RayCast3D::is_colliding() const {
return collided;
}
Object *RayCast3D::get_collider() const {
if (against.is_null())
return nullptr;
@ -81,9 +82,11 @@ Object *RayCast3D::get_collider() const {
int RayCast3D::get_collider_shape() const {
return against_shape;
}
Vector3 RayCast3D::get_collision_point() const {
return collision_point;
}
Vector3 RayCast3D::get_collision_normal() const {
return collision_normal;
}