A Whole New World (clang-format edition)

I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code

1 files changed, 32 insertions, 51 deletions

diff --git a/servers/physics_2d/area_pair_2d_sw.cpp b/servers/physics_2d/area_pair_2d_sw.cpp
index cb91caf626..769db8eb35 100644
--- a/servers/physics_2d/area_pair_2d_sw.cpp
+++ b/servers/physics_2d/area_pair_2d_sw.cpp
@@ -29,124 +29,105 @@
 #include "area_pair_2d_sw.h"
 #include "collision_solver_2d_sw.h"
 
-
 bool AreaPair2DSW::setup(real_t p_step) {
 
-	bool result = area->test_collision_mask(body) &&  CollisionSolver2DSW::solve(body->get_shape(body_shape),body->get_transform() * body->get_shape_transform(body_shape),Vector2(),area->get_shape(area_shape),area->get_transform() * area->get_shape_transform(area_shape),Vector2(),NULL,this);
+	bool result = area->test_collision_mask(body) && CollisionSolver2DSW::solve(body->get_shape(body_shape), body->get_transform() * body->get_shape_transform(body_shape), Vector2(), area->get_shape(area_shape), area->get_transform() * area->get_shape_transform(area_shape), Vector2(), NULL, this);
 
-	if (result!=colliding) {
+	if (result != colliding) {
 
 		if (result) {
 
-			if (area->get_space_override_mode()!=Physics2DServer::AREA_SPACE_OVERRIDE_DISABLED)
+			if (area->get_space_override_mode() != Physics2DServer::AREA_SPACE_OVERRIDE_DISABLED)
 				body->add_area(area);
 			if (area->has_monitor_callback())
-				area->add_body_to_query(body,body_shape,area_shape);
+				area->add_body_to_query(body, body_shape, area_shape);
 
 		} else {
 
-			if (area->get_space_override_mode()!=Physics2DServer::AREA_SPACE_OVERRIDE_DISABLED)
+			if (area->get_space_override_mode() != Physics2DServer::AREA_SPACE_OVERRIDE_DISABLED)
 				body->remove_area(area);
 			if (area->has_monitor_callback())
-				area->remove_body_from_query(body,body_shape,area_shape);
-
+				area->remove_body_from_query(body, body_shape, area_shape);
 		}
 
-		colliding=result;
-
+		colliding = result;
 	}
 
 	return false; //never do any post solving
 }
 
 void AreaPair2DSW::solve(real_t p_step) {
-
-
 }
 
+AreaPair2DSW::AreaPair2DSW(Body2DSW *p_body, int p_body_shape, Area2DSW *p_area, int p_area_shape) {
 
-AreaPair2DSW::AreaPair2DSW(Body2DSW *p_body,int p_body_shape, Area2DSW *p_area,int p_area_shape) {
-
-
-	body=p_body;
-	area=p_area;
-	body_shape=p_body_shape;
-	area_shape=p_area_shape;
-	colliding=false;
-	body->add_constraint(this,0);
+	body = p_body;
+	area = p_area;
+	body_shape = p_body_shape;
+	area_shape = p_area_shape;
+	colliding = false;
+	body->add_constraint(this, 0);
 	area->add_constraint(this);
-	if (p_body->get_mode()==Physics2DServer::BODY_MODE_KINEMATIC) //need to be active to process pair
+	if (p_body->get_mode() == Physics2DServer::BODY_MODE_KINEMATIC) //need to be active to process pair
 		p_body->set_active(true);
-
 }
 
 AreaPair2DSW::~AreaPair2DSW() {
 
 	if (colliding) {
 
-		if (area->get_space_override_mode()!=Physics2DServer::AREA_SPACE_OVERRIDE_DISABLED)
+		if (area->get_space_override_mode() != Physics2DServer::AREA_SPACE_OVERRIDE_DISABLED)
 			body->remove_area(area);
 		if (area->has_monitor_callback())
-			area->remove_body_from_query(body,body_shape,area_shape);
-
-
+			area->remove_body_from_query(body, body_shape, area_shape);
 	}
 	body->remove_constraint(this);
 	area->remove_constraint(this);
 }
 
-
 //////////////////////////////////
 
-
-
 bool Area2Pair2DSW::setup(real_t p_step) {
 
-	bool result = area_a->test_collision_mask(area_b) && CollisionSolver2DSW::solve(area_a->get_shape(shape_a),area_a->get_transform() * area_a->get_shape_transform(shape_a),Vector2(),area_b->get_shape(shape_b),area_b->get_transform() * area_b->get_shape_transform(shape_b),Vector2(),NULL,this);
+	bool result = area_a->test_collision_mask(area_b) && CollisionSolver2DSW::solve(area_a->get_shape(shape_a), area_a->get_transform() * area_a->get_shape_transform(shape_a), Vector2(), area_b->get_shape(shape_b), area_b->get_transform() * area_b->get_shape_transform(shape_b), Vector2(), NULL, this);
 
-	if (result!=colliding) {
+	if (result != colliding) {
 
 		if (result) {
 
 			if (area_b->has_area_monitor_callback() && area_a->is_monitorable())
-				area_b->add_area_to_query(area_a,shape_a,shape_b);
+				area_b->add_area_to_query(area_a, shape_a, shape_b);
 
 			if (area_a->has_area_monitor_callback() && area_b->is_monitorable())
-				area_a->add_area_to_query(area_b,shape_b,shape_a);
+				area_a->add_area_to_query(area_b, shape_b, shape_a);
 
 		} else {
 
 			if (area_b->has_area_monitor_callback() && area_a->is_monitorable())
-				area_b->remove_area_from_query(area_a,shape_a,shape_b);
+				area_b->remove_area_from_query(area_a, shape_a, shape_b);
 
 			if (area_a->has_area_monitor_callback() && area_b->is_monitorable())
-				area_a->remove_area_from_query(area_b,shape_b,shape_a);
+				area_a->remove_area_from_query(area_b, shape_b, shape_a);
 		}
 
-		colliding=result;
-
+		colliding = result;
 	}
 
 	return false; //never do any post solving
 }
 
 void Area2Pair2DSW::solve(real_t p_step) {
-
-
 }
 
+Area2Pair2DSW::Area2Pair2DSW(Area2DSW *p_area_a, int p_shape_a, Area2DSW *p_area_b, int p_shape_b) {
 
-Area2Pair2DSW::Area2Pair2DSW(Area2DSW *p_area_a,int p_shape_a, Area2DSW *p_area_b,int p_shape_b) {
-
-
-	area_a=p_area_a;
-	area_b=p_area_b;
-	shape_a=p_shape_a;
-	shape_b=p_shape_b;
-	colliding=false;
+	area_a = p_area_a;
+	area_b = p_area_b;
+	shape_a = p_shape_a;
+	shape_b = p_shape_b;
+	colliding = false;
 	area_a->add_constraint(this);
 	area_b->add_constraint(this);
-
 }
 
 Area2Pair2DSW::~Area2Pair2DSW() {
@@ -154,10 +135,10 @@ Area2Pair2DSW::~Area2Pair2DSW() {
 	if (colliding) {
 
 		if (area_b->has_area_monitor_callback() && area_a->is_monitorable())
-			area_b->remove_area_from_query(area_a,shape_a,shape_b);
+			area_b->remove_area_from_query(area_a, shape_a, shape_b);
 
 		if (area_a->has_area_monitor_callback() && area_b->is_monitorable())
-			area_a->remove_area_from_query(area_b,shape_b,shape_a);
+			area_a->remove_area_from_query(area_b, shape_b, shape_a);
 	}
 
 	area_a->remove_constraint(this);