godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

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

14
servers/physics_server_2d.cpp
View File

@@ -146,6 +146,7 @@ RID PhysicsShapeQueryParameters2D::get_shape_rid() const {
void PhysicsShapeQueryParameters2D::set_transform(const Transform2D &p_transform) {
transform = p_transform;
}
Transform2D PhysicsShapeQueryParameters2D::get_transform() const {
return transform;
}
@@ -153,6 +154,7 @@ Transform2D PhysicsShapeQueryParameters2D::get_transform() const {
void PhysicsShapeQueryParameters2D::set_motion(const Vector2 &p_motion) {
motion = p_motion;
}
Vector2 PhysicsShapeQueryParameters2D::get_motion() const {
return motion;
}
@@ -160,6 +162,7 @@ Vector2 PhysicsShapeQueryParameters2D::get_motion() const {
void PhysicsShapeQueryParameters2D::set_margin(float p_margin) {
margin = p_margin;
}
float PhysicsShapeQueryParameters2D::get_margin() const {
return margin;
}
@@ -167,6 +170,7 @@ float PhysicsShapeQueryParameters2D::get_margin() const {
void PhysicsShapeQueryParameters2D::set_collision_mask(int p_collision_mask) {
collision_mask = p_collision_mask;
}
int PhysicsShapeQueryParameters2D::get_collision_mask() const {
return collision_mask;
}
@@ -359,6 +363,7 @@ Array PhysicsDirectSpaceState2D::_collide_shape(const Ref<PhysicsShapeQueryParam
r[i] = ret[i];
return r;
}
Dictionary PhysicsDirectSpaceState2D::_get_rest_info(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query) {
ERR_FAIL_COND_V(!p_shape_query.is_valid(), Dictionary());
@@ -396,15 +401,19 @@ void PhysicsDirectSpaceState2D::_bind_methods() {
int PhysicsShapeQueryResult2D::get_result_count() const {
return result.size();
}
RID PhysicsShapeQueryResult2D::get_result_rid(int p_idx) const {
return result[p_idx].rid;
}
ObjectID PhysicsShapeQueryResult2D::get_result_object_id(int p_idx) const {
return result[p_idx].collider_id;
}
Object *PhysicsShapeQueryResult2D::get_result_object(int p_idx) const {
return result[p_idx].collider;
}
int PhysicsShapeQueryResult2D::get_result_object_shape(int p_idx) const {
return result[p_idx].shape;
}
@@ -425,6 +434,7 @@ void PhysicsShapeQueryResult2D::_bind_methods() {
Vector2 PhysicsTestMotionResult2D::get_motion() const {
return result.motion;
}
Vector2 PhysicsTestMotionResult2D::get_motion_remainder() const {
return result.remainder;
}
@@ -432,15 +442,19 @@ Vector2 PhysicsTestMotionResult2D::get_motion_remainder() const {
Vector2 PhysicsTestMotionResult2D::get_collision_point() const {
return result.collision_point;
}
Vector2 PhysicsTestMotionResult2D::get_collision_normal() const {
return result.collision_normal;
}
Vector2 PhysicsTestMotionResult2D::get_collider_velocity() const {
return result.collider_velocity;
}
ObjectID PhysicsTestMotionResult2D::get_collider_id() const {
return result.collider_id;
}
RID PhysicsTestMotionResult2D::get_collider_rid() const {
return result.collider;
}