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, 7 insertions, 14 deletions

diff --git a/core/math/vector3.cpp b/core/math/vector3.cpp
index 353b2acd16..568df48c62 100644
--- a/core/math/vector3.cpp
+++ b/core/math/vector3.cpp
@@ -33,12 +33,10 @@
 #include "core/math/basis.h"
 
 void Vector3::rotate(const Vector3 &p_axis, real_t p_phi) {
-
 	*this = Basis(p_axis, p_phi).xform(*this);
 }
 
 Vector3 Vector3::rotated(const Vector3 &p_axis, real_t p_phi) const {
-
 	Vector3 r = *this;
 	r.rotate(p_axis, p_phi);
 	return r;
@@ -48,36 +46,33 @@ void Vector3::set_axis(int p_axis, real_t p_value) {
 	ERR_FAIL_INDEX(p_axis, 3);
 	coord[p_axis] = p_value;
 }
-real_t Vector3::get_axis(int p_axis) const {
 
+real_t Vector3::get_axis(int p_axis) const {
 	ERR_FAIL_INDEX_V(p_axis, 3, 0);
 	return operator[](p_axis);
 }
 
 int Vector3::min_axis() const {
-
 	return x < y ? (x < z ? 0 : 2) : (y < z ? 1 : 2);
 }
-int Vector3::max_axis() const {
 
+int Vector3::max_axis() const {
 	return x < y ? (y < z ? 2 : 1) : (x < z ? 2 : 0);
 }
 
 void Vector3::snap(Vector3 p_val) {
-
 	x = Math::stepify(x, p_val.x);
 	y = Math::stepify(y, p_val.y);
 	z = Math::stepify(z, p_val.z);
 }
-Vector3 Vector3::snapped(Vector3 p_val) const {
 
+Vector3 Vector3::snapped(Vector3 p_val) const {
 	Vector3 v = *this;
 	v.snap(p_val);
 	return v;
 }
 
 Vector3 Vector3::cubic_interpolaten(const Vector3 &p_b, const Vector3 &p_pre_a, const Vector3 &p_post_b, real_t p_t) const {
-
 	Vector3 p0 = p_pre_a;
 	Vector3 p1 = *this;
 	Vector3 p2 = p_b;
@@ -90,10 +85,12 @@ Vector3 Vector3::cubic_interpolaten(const Vector3 &p_b, const Vector3 &p_pre_a,
 		real_t bc = p1.distance_to(p2);
 		real_t cd = p2.distance_to(p3);
 
-		if (ab > 0)
+		if (ab > 0) {
 			p0 = p1 + (p0 - p1) * (bc / ab);
-		if (cd > 0)
+		}
+		if (cd > 0) {
 			p3 = p2 + (p3 - p2) * (bc / cd);
+		}
 	}
 
 	real_t t = p_t;
@@ -109,7 +106,6 @@ Vector3 Vector3::cubic_interpolaten(const Vector3 &p_b, const Vector3 &p_pre_a,
 }
 
 Vector3 Vector3::cubic_interpolate(const Vector3 &p_b, const Vector3 &p_pre_a, const Vector3 &p_post_b, real_t p_t) const {
-
 	Vector3 p0 = p_pre_a;
 	Vector3 p1 = *this;
 	Vector3 p2 = p_b;
@@ -135,7 +131,6 @@ Vector3 Vector3::move_toward(const Vector3 &p_to, const real_t p_delta) const {
 }
 
 Basis Vector3::outer(const Vector3 &p_b) const {
-
 	Vector3 row0(x * p_b.x, x * p_b.y, x * p_b.z);
 	Vector3 row1(y * p_b.x, y * p_b.y, y * p_b.z);
 	Vector3 row2(z * p_b.x, z * p_b.y, z * p_b.z);
@@ -150,11 +145,9 @@ Basis Vector3::to_diagonal_matrix() const {
 }
 
 bool Vector3::is_equal_approx(const Vector3 &p_v) const {
-
 	return Math::is_equal_approx(x, p_v.x) && Math::is_equal_approx(y, p_v.y) && Math::is_equal_approx(z, p_v.z);
 }
 
 Vector3::operator String() const {
-
 	return (rtos(x) + ", " + rtos(y) + ", " + rtos(z));
 }