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, 58 deletions

diff --git a/scene/2d/joints_2d.cpp b/scene/2d/joints_2d.cpp
index 4d49f4762f..0d126b949d 100644
--- a/scene/2d/joints_2d.cpp
+++ b/scene/2d/joints_2d.cpp
@@ -35,10 +35,10 @@
 #include "servers/physics_server_2d.h"
 
 void Joint2D::_update_joint(bool p_only_free) {
-
 	if (joint.is_valid()) {
-		if (ba.is_valid() && bb.is_valid() && exclude_from_collision)
+		if (ba.is_valid() && bb.is_valid() && exclude_from_collision) {
 			PhysicsServer2D::get_singleton()->joint_disable_collisions_between_bodies(joint, false);
+		}
 
 		PhysicsServer2D::get_singleton()->free(joint);
 		joint = RID();
@@ -46,25 +46,29 @@ void Joint2D::_update_joint(bool p_only_free) {
 		bb = RID();
 	}
 
-	if (p_only_free || !is_inside_tree())
+	if (p_only_free || !is_inside_tree()) {
 		return;
+	}
 
 	Node *node_a = has_node(get_node_a()) ? get_node(get_node_a()) : (Node *)nullptr;
 	Node *node_b = has_node(get_node_b()) ? get_node(get_node_b()) : (Node *)nullptr;
 
-	if (!node_a || !node_b)
+	if (!node_a || !node_b) {
 		return;
+	}
 
 	PhysicsBody2D *body_a = Object::cast_to<PhysicsBody2D>(node_a);
 	PhysicsBody2D *body_b = Object::cast_to<PhysicsBody2D>(node_b);
 
-	if (!body_a || !body_b)
+	if (!body_a || !body_b) {
 		return;
+	}
 
 	joint = _configure_joint(body_a, body_b);
 
-	if (!joint.is_valid())
+	if (!joint.is_valid()) {
 		return;
+	}
 
 	PhysicsServer2D::get_singleton()->get_singleton()->joint_set_param(joint, PhysicsServer2D::JOINT_PARAM_BIAS, bias);
 
@@ -75,35 +79,32 @@ void Joint2D::_update_joint(bool p_only_free) {
 }
 
 void Joint2D::set_node_a(const NodePath &p_node_a) {
-
-	if (a == p_node_a)
+	if (a == p_node_a) {
 		return;
+	}
 
 	a = p_node_a;
 	_update_joint();
 }
 
 NodePath Joint2D::get_node_a() const {
-
 	return a;
 }
 
 void Joint2D::set_node_b(const NodePath &p_node_b) {
-
-	if (b == p_node_b)
+	if (b == p_node_b) {
 		return;
+	}
 	b = p_node_b;
 	_update_joint();
 }
-NodePath Joint2D::get_node_b() const {
 
+NodePath Joint2D::get_node_b() const {
 	return b;
 }
 
 void Joint2D::_notification(int p_what) {
-
 	switch (p_what) {
-
 		case NOTIFICATION_READY: {
 			_update_joint();
 		} break;
@@ -116,21 +117,20 @@ void Joint2D::_notification(int p_what) {
 }
 
 void Joint2D::set_bias(real_t p_bias) {
-
 	bias = p_bias;
-	if (joint.is_valid())
+	if (joint.is_valid()) {
 		PhysicsServer2D::get_singleton()->get_singleton()->joint_set_param(joint, PhysicsServer2D::JOINT_PARAM_BIAS, bias);
+	}
 }
 
 real_t Joint2D::get_bias() const {
-
 	return bias;
 }
 
 void Joint2D::set_exclude_nodes_from_collision(bool p_enable) {
-
-	if (exclude_from_collision == p_enable)
+	if (exclude_from_collision == p_enable) {
 		return;
+	}
 
 	_update_joint(true);
 	exclude_from_collision = p_enable;
@@ -138,12 +138,10 @@ void Joint2D::set_exclude_nodes_from_collision(bool p_enable) {
 }
 
 bool Joint2D::get_exclude_nodes_from_collision() const {
-
 	return exclude_from_collision;
 }
 
 void Joint2D::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_node_a", "node"), &Joint2D::set_node_a);
 	ClassDB::bind_method(D_METHOD("get_node_a"), &Joint2D::get_node_a);
 
@@ -163,7 +161,6 @@ void Joint2D::_bind_methods() {
 }
 
 Joint2D::Joint2D() {
-
 	bias = 0;
 	exclude_from_collision = true;
 }
@@ -173,12 +170,11 @@ Joint2D::Joint2D() {
 ///////////////////////////////////////////////////////////////////////////////
 
 void PinJoint2D::_notification(int p_what) {
-
 	switch (p_what) {
 		case NOTIFICATION_DRAW: {
-
-			if (!is_inside_tree())
+			if (!is_inside_tree()) {
 				break;
+			}
 
 			if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) {
 				break;
@@ -191,27 +187,24 @@ void PinJoint2D::_notification(int p_what) {
 }
 
 RID PinJoint2D::_configure_joint(PhysicsBody2D *body_a, PhysicsBody2D *body_b) {
-
 	RID pj = PhysicsServer2D::get_singleton()->pin_joint_create(get_global_transform().get_origin(), body_a->get_rid(), body_b ? body_b->get_rid() : RID());
 	PhysicsServer2D::get_singleton()->pin_joint_set_param(pj, PhysicsServer2D::PIN_JOINT_SOFTNESS, softness);
 	return pj;
 }
 
 void PinJoint2D::set_softness(real_t p_softness) {
-
 	softness = p_softness;
 	update();
-	if (get_joint().is_valid())
+	if (get_joint().is_valid()) {
 		PhysicsServer2D::get_singleton()->pin_joint_set_param(get_joint(), PhysicsServer2D::PIN_JOINT_SOFTNESS, p_softness);
+	}
 }
 
 real_t PinJoint2D::get_softness() const {
-
 	return softness;
 }
 
 void PinJoint2D::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_softness", "softness"), &PinJoint2D::set_softness);
 	ClassDB::bind_method(D_METHOD("get_softness"), &PinJoint2D::get_softness);
 
@@ -219,7 +212,6 @@ void PinJoint2D::_bind_methods() {
 }
 
 PinJoint2D::PinJoint2D() {
-
 	softness = 0;
 }
 
@@ -228,11 +220,11 @@ PinJoint2D::PinJoint2D() {
 ///////////////////////////////////////////////////////////////////////////////
 
 void GrooveJoint2D::_notification(int p_what) {
-
 	switch (p_what) {
 		case NOTIFICATION_DRAW: {
-			if (!is_inside_tree())
+			if (!is_inside_tree()) {
 				break;
+			}
 
 			if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) {
 				break;
@@ -247,7 +239,6 @@ void GrooveJoint2D::_notification(int p_what) {
 }
 
 RID GrooveJoint2D::_configure_joint(PhysicsBody2D *body_a, PhysicsBody2D *body_b) {
-
 	Transform2D gt = get_global_transform();
 	Vector2 groove_A1 = gt.get_origin();
 	Vector2 groove_A2 = gt.xform(Vector2(0, length));
@@ -257,29 +248,24 @@ RID GrooveJoint2D::_configure_joint(PhysicsBody2D *body_a, PhysicsBody2D *body_b
 }
 
 void GrooveJoint2D::set_length(real_t p_length) {
-
 	length = p_length;
 	update();
 }
 
 real_t GrooveJoint2D::get_length() const {
-
 	return length;
 }
 
 void GrooveJoint2D::set_initial_offset(real_t p_initial_offset) {
-
 	initial_offset = p_initial_offset;
 	update();
 }
 
 real_t GrooveJoint2D::get_initial_offset() const {
-
 	return initial_offset;
 }
 
 void GrooveJoint2D::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_length", "length"), &GrooveJoint2D::set_length);
 	ClassDB::bind_method(D_METHOD("get_length"), &GrooveJoint2D::get_length);
 	ClassDB::bind_method(D_METHOD("set_initial_offset", "offset"), &GrooveJoint2D::set_initial_offset);
@@ -290,7 +276,6 @@ void GrooveJoint2D::_bind_methods() {
 }
 
 GrooveJoint2D::GrooveJoint2D() {
-
 	length = 50;
 	initial_offset = 25;
 }
@@ -300,12 +285,11 @@ GrooveJoint2D::GrooveJoint2D() {
 ///////////////////////////////////////////////////////////////////////////////
 
 void DampedSpringJoint2D::_notification(int p_what) {
-
 	switch (p_what) {
 		case NOTIFICATION_DRAW: {
-
-			if (!is_inside_tree())
+			if (!is_inside_tree()) {
 				break;
+			}
 
 			if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) {
 				break;
@@ -319,14 +303,14 @@ void DampedSpringJoint2D::_notification(int p_what) {
 }
 
 RID DampedSpringJoint2D::_configure_joint(PhysicsBody2D *body_a, PhysicsBody2D *body_b) {
-
 	Transform2D gt = get_global_transform();
 	Vector2 anchor_A = gt.get_origin();
 	Vector2 anchor_B = gt.xform(Vector2(0, length));
 
 	RID dsj = PhysicsServer2D::get_singleton()->damped_spring_joint_create(anchor_A, anchor_B, body_a->get_rid(), body_b->get_rid());
-	if (rest_length)
+	if (rest_length) {
 		PhysicsServer2D::get_singleton()->damped_string_joint_set_param(dsj, PhysicsServer2D::DAMPED_STRING_REST_LENGTH, rest_length);
+	}
 	PhysicsServer2D::get_singleton()->damped_string_joint_set_param(dsj, PhysicsServer2D::DAMPED_STRING_STIFFNESS, stiffness);
 	PhysicsServer2D::get_singleton()->damped_string_joint_set_param(dsj, PhysicsServer2D::DAMPED_STRING_DAMPING, damping);
 
@@ -334,57 +318,51 @@ RID DampedSpringJoint2D::_configure_joint(PhysicsBody2D *body_a, PhysicsBody2D *
 }
 
 void DampedSpringJoint2D::set_length(real_t p_length) {
-
 	length = p_length;
 	update();
 }
 
 real_t DampedSpringJoint2D::get_length() const {
-
 	return length;
 }
 
 void DampedSpringJoint2D::set_rest_length(real_t p_rest_length) {
-
 	rest_length = p_rest_length;
 	update();
-	if (get_joint().is_valid())
+	if (get_joint().is_valid()) {
 		PhysicsServer2D::get_singleton()->damped_string_joint_set_param(get_joint(), PhysicsServer2D::DAMPED_STRING_REST_LENGTH, p_rest_length ? p_rest_length : length);
+	}
 }
 
 real_t DampedSpringJoint2D::get_rest_length() const {
-
 	return rest_length;
 }
 
 void DampedSpringJoint2D::set_stiffness(real_t p_stiffness) {
-
 	stiffness = p_stiffness;
 	update();
-	if (get_joint().is_valid())
+	if (get_joint().is_valid()) {
 		PhysicsServer2D::get_singleton()->damped_string_joint_set_param(get_joint(), PhysicsServer2D::DAMPED_STRING_STIFFNESS, p_stiffness);
+	}
 }
 
 real_t DampedSpringJoint2D::get_stiffness() const {
-
 	return stiffness;
 }
 
 void DampedSpringJoint2D::set_damping(real_t p_damping) {
-
 	damping = p_damping;
 	update();
-	if (get_joint().is_valid())
+	if (get_joint().is_valid()) {
 		PhysicsServer2D::get_singleton()->damped_string_joint_set_param(get_joint(), PhysicsServer2D::DAMPED_STRING_DAMPING, p_damping);
+	}
 }
 
 real_t DampedSpringJoint2D::get_damping() const {
-
 	return damping;
 }
 
 void DampedSpringJoint2D::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_length", "length"), &DampedSpringJoint2D::set_length);
 	ClassDB::bind_method(D_METHOD("get_length"), &DampedSpringJoint2D::get_length);
 	ClassDB::bind_method(D_METHOD("set_rest_length", "rest_length"), &DampedSpringJoint2D::set_rest_length);
@@ -401,7 +379,6 @@ void DampedSpringJoint2D::_bind_methods() {
 }
 
 DampedSpringJoint2D::DampedSpringJoint2D() {
-
 	length = 50;
 	rest_length = 0;
 	stiffness = 20;