Merge pull request #38738 from akien-mga/cause-we-never-go-out-of-style

Style: Remove new line at block start, enforce line between functions, enforce braces in if and loop blocks

1 files changed, 35 insertions, 40 deletions

diff --git a/servers/physics_3d/collision_solver_3d_sw.cpp b/servers/physics_3d/collision_solver_3d_sw.cpp
index 5d31e1f546..e2bfaf990d 100644
--- a/servers/physics_3d/collision_solver_3d_sw.cpp
+++ b/servers/physics_3d/collision_solver_3d_sw.cpp
@@ -37,10 +37,10 @@
 //#define collision_solver gjk_epa_calculate_penetration
 
 bool CollisionSolver3DSW::solve_static_plane(const Shape3DSW *p_shape_A, const Transform &p_transform_A, const Shape3DSW *p_shape_B, const Transform &p_transform_B, CallbackResult p_result_callback, void *p_userdata, bool p_swap_result) {
-
 	const PlaneShape3DSW *plane = static_cast<const PlaneShape3DSW *>(p_shape_A);
-	if (p_shape_B->get_type() == PhysicsServer3D::SHAPE_PLANE)
+	if (p_shape_B->get_type() == PhysicsServer3D::SHAPE_PLANE) {
 		return false;
+	}
 	Plane p = p_transform_A.xform(plane->get_plane());
 
 	static const int max_supports = 16;
@@ -52,19 +52,20 @@ bool CollisionSolver3DSW::solve_static_plane(const Shape3DSW *p_shape_A, const T
 	bool found = false;
 
 	for (int i = 0; i < support_count; i++) {
-
 		supports[i] = p_transform_B.xform(supports[i]);
-		if (p.distance_to(supports[i]) >= 0)
+		if (p.distance_to(supports[i]) >= 0) {
 			continue;
+		}
 		found = true;
 
 		Vector3 support_A = p.project(supports[i]);
 
 		if (p_result_callback) {
-			if (p_swap_result)
+			if (p_swap_result) {
 				p_result_callback(supports[i], support_A, p_userdata);
-			else
+			} else {
 				p_result_callback(support_A, supports[i], p_userdata);
+			}
 		}
 	}
 
@@ -72,7 +73,6 @@ bool CollisionSolver3DSW::solve_static_plane(const Shape3DSW *p_shape_A, const T
 }
 
 bool CollisionSolver3DSW::solve_ray(const Shape3DSW *p_shape_A, const Transform &p_transform_A, const Shape3DSW *p_shape_B, const Transform &p_transform_B, CallbackResult p_result_callback, void *p_userdata, bool p_swap_result) {
-
 	const RayShape3DSW *ray = static_cast<const RayShape3DSW *>(p_shape_A);
 
 	Vector3 from = p_transform_A.origin;
@@ -85,8 +85,9 @@ bool CollisionSolver3DSW::solve_ray(const Shape3DSW *p_shape_A, const Transform
 	to = ai.xform(to);
 
 	Vector3 p, n;
-	if (!p_shape_B->intersect_segment(from, to, p, n))
+	if (!p_shape_B->intersect_segment(from, to, p, n)) {
 		return false;
+	}
 
 	Vector3 support_B = p_transform_B.xform(p);
 	if (ray->get_slips_on_slope()) {
@@ -95,16 +96,16 @@ bool CollisionSolver3DSW::solve_ray(const Shape3DSW *p_shape_A, const Transform
 	}
 
 	if (p_result_callback) {
-		if (p_swap_result)
+		if (p_swap_result) {
 			p_result_callback(support_B, support_A, p_userdata);
-		else
+		} else {
 			p_result_callback(support_A, support_B, p_userdata);
+		}
 	}
 	return true;
 }
 
 struct _ConcaveCollisionInfo {
-
 	const Transform *transform_A;
 	const Shape3DSW *shape_A;
 	const Transform *transform_B;
@@ -121,20 +122,19 @@ struct _ConcaveCollisionInfo {
 };
 
 void CollisionSolver3DSW::concave_callback(void *p_userdata, Shape3DSW *p_convex) {
-
 	_ConcaveCollisionInfo &cinfo = *(_ConcaveCollisionInfo *)(p_userdata);
 	cinfo.aabb_tests++;
 
 	bool collided = collision_solver(cinfo.shape_A, *cinfo.transform_A, p_convex, *cinfo.transform_B, cinfo.result_callback, cinfo.userdata, cinfo.swap_result, nullptr, cinfo.margin_A, cinfo.margin_B);
-	if (!collided)
+	if (!collided) {
 		return;
+	}
 
 	cinfo.collided = true;
 	cinfo.collisions++;
 }
 
 bool CollisionSolver3DSW::solve_concave(const Shape3DSW *p_shape_A, const Transform &p_transform_A, const Shape3DSW *p_shape_B, const Transform &p_transform_B, CallbackResult p_result_callback, void *p_userdata, bool p_swap_result, real_t p_margin_A, real_t p_margin_B) {
-
 	const ConcaveShape3DSW *concave_B = static_cast<const ConcaveShape3DSW *>(p_shape_B);
 
 	_ConcaveCollisionInfo cinfo;
@@ -158,7 +158,6 @@ bool CollisionSolver3DSW::solve_concave(const Shape3DSW *p_shape_A, const Transf
 
 	AABB local_aabb;
 	for (int i = 0; i < 3; i++) {
-
 		Vector3 axis(p_transform_B.basis.get_axis(i));
 		real_t axis_scale = 1.0 / axis.length();
 		axis *= axis_scale;
@@ -180,7 +179,6 @@ bool CollisionSolver3DSW::solve_concave(const Shape3DSW *p_shape_A, const Transf
 }
 
 bool CollisionSolver3DSW::solve_static(const Shape3DSW *p_shape_A, const Transform &p_transform_A, const Shape3DSW *p_shape_B, const Transform &p_transform_B, CallbackResult p_result_callback, void *p_userdata, Vector3 *r_sep_axis, real_t p_margin_A, real_t p_margin_B) {
-
 	PhysicsServer3D::ShapeType type_A = p_shape_A->get_type();
 	PhysicsServer3D::ShapeType type_B = p_shape_B->get_type();
 	bool concave_A = p_shape_A->is_concave();
@@ -195,9 +193,9 @@ bool CollisionSolver3DSW::solve_static(const Shape3DSW *p_shape_A, const Transfo
 	}
 
 	if (type_A == PhysicsServer3D::SHAPE_PLANE) {
-
-		if (type_B == PhysicsServer3D::SHAPE_PLANE)
+		if (type_B == PhysicsServer3D::SHAPE_PLANE) {
 			return false;
+		}
 		if (type_B == PhysicsServer3D::SHAPE_RAY) {
 			return false;
 		}
@@ -209,9 +207,9 @@ bool CollisionSolver3DSW::solve_static(const Shape3DSW *p_shape_A, const Transfo
 		}
 
 	} else if (type_A == PhysicsServer3D::SHAPE_RAY) {
-
-		if (type_B == PhysicsServer3D::SHAPE_RAY)
+		if (type_B == PhysicsServer3D::SHAPE_RAY) {
 			return false;
+		}
 
 		if (swap) {
 			return solve_ray(p_shape_B, p_transform_B, p_shape_A, p_transform_A, p_result_callback, p_userdata, true);
@@ -220,35 +218,35 @@ bool CollisionSolver3DSW::solve_static(const Shape3DSW *p_shape_A, const Transfo
 		}
 
 	} else if (concave_B) {
-
-		if (concave_A)
+		if (concave_A) {
 			return false;
+		}
 
-		if (!swap)
+		if (!swap) {
 			return solve_concave(p_shape_A, p_transform_A, p_shape_B, p_transform_B, p_result_callback, p_userdata, false, p_margin_A, p_margin_B);
-		else
+		} else {
 			return solve_concave(p_shape_B, p_transform_B, p_shape_A, p_transform_A, p_result_callback, p_userdata, true, p_margin_A, p_margin_B);
+		}
 
 	} else {
-
 		return collision_solver(p_shape_A, p_transform_A, p_shape_B, p_transform_B, p_result_callback, p_userdata, false, r_sep_axis, p_margin_A, p_margin_B);
 	}
 }
 
 void CollisionSolver3DSW::concave_distance_callback(void *p_userdata, Shape3DSW *p_convex) {
-
 	_ConcaveCollisionInfo &cinfo = *(_ConcaveCollisionInfo *)(p_userdata);
 	cinfo.aabb_tests++;
-	if (cinfo.collided)
+	if (cinfo.collided) {
 		return;
+	}
 
 	Vector3 close_A, close_B;
 	cinfo.collided = !gjk_epa_calculate_distance(cinfo.shape_A, *cinfo.transform_A, p_convex, *cinfo.transform_B, close_A, close_B);
 
-	if (cinfo.collided)
+	if (cinfo.collided) {
 		return;
+	}
 	if (!cinfo.tested || close_A.distance_squared_to(close_B) < cinfo.close_A.distance_squared_to(cinfo.close_B)) {
-
 		cinfo.close_A = close_A;
 		cinfo.close_B = close_B;
 		cinfo.tested = true;
@@ -258,10 +256,10 @@ void CollisionSolver3DSW::concave_distance_callback(void *p_userdata, Shape3DSW
 }
 
 bool CollisionSolver3DSW::solve_distance_plane(const Shape3DSW *p_shape_A, const Transform &p_transform_A, const Shape3DSW *p_shape_B, const Transform &p_transform_B, Vector3 &r_point_A, Vector3 &r_point_B) {
-
 	const PlaneShape3DSW *plane = static_cast<const PlaneShape3DSW *>(p_shape_A);
-	if (p_shape_B->get_type() == PhysicsServer3D::SHAPE_PLANE)
+	if (p_shape_B->get_type() == PhysicsServer3D::SHAPE_PLANE) {
 		return false;
+	}
 	Plane p = p_transform_A.xform(plane->get_plane());
 
 	static const int max_supports = 16;
@@ -275,14 +273,14 @@ bool CollisionSolver3DSW::solve_distance_plane(const Shape3DSW *p_shape_A, const
 	real_t closest_d = 0;
 
 	for (int i = 0; i < support_count; i++) {
-
 		supports[i] = p_transform_B.xform(supports[i]);
 		real_t d = p.distance_to(supports[i]);
 		if (i == 0 || d < closest_d) {
 			closest = supports[i];
 			closest_d = d;
-			if (d <= 0)
+			if (d <= 0) {
 				collided = true;
+			}
 		}
 	}
 
@@ -293,12 +291,11 @@ bool CollisionSolver3DSW::solve_distance_plane(const Shape3DSW *p_shape_A, const
 }
 
 bool CollisionSolver3DSW::solve_distance(const Shape3DSW *p_shape_A, const Transform &p_transform_A, const Shape3DSW *p_shape_B, const Transform &p_transform_B, Vector3 &r_point_A, Vector3 &r_point_B, const AABB &p_concave_hint, Vector3 *r_sep_axis) {
-
-	if (p_shape_A->is_concave())
+	if (p_shape_A->is_concave()) {
 		return false;
+	}
 
 	if (p_shape_B->get_type() == PhysicsServer3D::SHAPE_PLANE) {
-
 		Vector3 a, b;
 		bool col = solve_distance_plane(p_shape_B, p_transform_B, p_shape_A, p_transform_A, a, b);
 		r_point_A = b;
@@ -306,9 +303,9 @@ bool CollisionSolver3DSW::solve_distance(const Shape3DSW *p_shape_A, const Trans
 		return !col;
 
 	} else if (p_shape_B->is_concave()) {
-
-		if (p_shape_A->is_concave())
+		if (p_shape_A->is_concave()) {
 			return false;
+		}
 
 		const ConcaveShape3DSW *concave_B = static_cast<const ConcaveShape3DSW *>(p_shape_B);
 
@@ -338,7 +335,6 @@ bool CollisionSolver3DSW::solve_distance(const Shape3DSW *p_shape_A, const Trans
 
 		AABB local_aabb;
 		for (int i = 0; i < 3; i++) {
-
 			Vector3 axis(p_transform_B.basis.get_axis(i));
 			real_t axis_scale = ((real_t)1.0) / axis.length();
 			axis *= axis_scale;
@@ -366,7 +362,6 @@ bool CollisionSolver3DSW::solve_distance(const Shape3DSW *p_shape_A, const Trans
 
 		return !cinfo.collided;
 	} else {
-
 		return gjk_epa_calculate_distance(p_shape_A, p_transform_A, p_shape_B, p_transform_B, r_point_A, r_point_B); //should pass sepaxis..
 	}
 }