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, 62 insertions, 73 deletions

diff --git a/servers/physics/collision_object_sw.cpp b/servers/physics/collision_object_sw.cpp
index 88aa737579..36704b6eb8 100644
--- a/servers/physics/collision_object_sw.cpp
+++ b/servers/physics/collision_object_sw.cpp
@@ -29,37 +29,35 @@
 #include "collision_object_sw.h"
 #include "space_sw.h"
 
-void CollisionObjectSW::add_shape(ShapeSW *p_shape,const Transform& p_transform) {
+void CollisionObjectSW::add_shape(ShapeSW *p_shape, const Transform &p_transform) {
 
 	Shape s;
-	s.shape=p_shape;
-	s.xform=p_transform;
-	s.xform_inv=s.xform.affine_inverse();
-	s.bpid=0; //needs update
+	s.shape = p_shape;
+	s.xform = p_transform;
+	s.xform_inv = s.xform.affine_inverse();
+	s.bpid = 0; //needs update
 	shapes.push_back(s);
 	p_shape->add_owner(this);
 	_update_shapes();
 	_shapes_changed();
-
 }
 
-void CollisionObjectSW::set_shape(int p_index,ShapeSW *p_shape){
+void CollisionObjectSW::set_shape(int p_index, ShapeSW *p_shape) {
 
-	ERR_FAIL_INDEX(p_index,shapes.size());
+	ERR_FAIL_INDEX(p_index, shapes.size());
 	shapes[p_index].shape->remove_owner(this);
-	shapes[p_index].shape=p_shape;
+	shapes[p_index].shape = p_shape;
 
 	p_shape->add_owner(this);
 	_update_shapes();
 	_shapes_changed();
-
 }
-void CollisionObjectSW::set_shape_transform(int p_index,const Transform& p_transform){
+void CollisionObjectSW::set_shape_transform(int p_index, const Transform &p_transform) {
 
-	ERR_FAIL_INDEX(p_index,shapes.size());
+	ERR_FAIL_INDEX(p_index, shapes.size());
 
-	shapes[p_index].xform=p_transform;
-	shapes[p_index].xform_inv=p_transform.affine_inverse();
+	shapes[p_index].xform = p_transform;
+	shapes[p_index].xform_inv = p_transform.affine_inverse();
 	_update_shapes();
 	_shapes_changed();
 }
@@ -67,61 +65,58 @@ void CollisionObjectSW::set_shape_transform(int p_index,const Transform& p_trans
 void CollisionObjectSW::remove_shape(ShapeSW *p_shape) {
 
 	//remove a shape, all the times it appears
-	for(int i=0;i<shapes.size();i++) {
+	for (int i = 0; i < shapes.size(); i++) {
 
-		if (shapes[i].shape==p_shape) {
+		if (shapes[i].shape == p_shape) {
 			remove_shape(i);
 			i--;
 		}
 	}
 }
 
-void CollisionObjectSW::remove_shape(int p_index){
+void CollisionObjectSW::remove_shape(int p_index) {
 
 	//remove anything from shape to be erased to end, so subindices don't change
-	ERR_FAIL_INDEX(p_index,shapes.size());
-	for(int i=p_index;i<shapes.size();i++) {
+	ERR_FAIL_INDEX(p_index, shapes.size());
+	for (int i = p_index; i < shapes.size(); i++) {
 
-		if (shapes[i].bpid==0)
+		if (shapes[i].bpid == 0)
 			continue;
 		//should never get here with a null owner
 		space->get_broadphase()->remove(shapes[i].bpid);
-		shapes[i].bpid=0;
+		shapes[i].bpid = 0;
 	}
 	shapes[p_index].shape->remove_owner(this);
 	shapes.remove(p_index);
 
 	_shapes_changed();
-
 }
 
 void CollisionObjectSW::_set_static(bool p_static) {
-	if (_static==p_static)
+	if (_static == p_static)
 		return;
-	_static=p_static;
+	_static = p_static;
 
 	if (!space)
 		return;
-	for(int i=0;i<get_shape_count();i++) {
-		Shape &s=shapes[i];
-		if (s.bpid>0) {
-			space->get_broadphase()->set_static(s.bpid,_static);
+	for (int i = 0; i < get_shape_count(); i++) {
+		Shape &s = shapes[i];
+		if (s.bpid > 0) {
+			space->get_broadphase()->set_static(s.bpid, _static);
 		}
 	}
-
 }
 
 void CollisionObjectSW::_unregister_shapes() {
 
-	for(int i=0;i<shapes.size();i++) {
+	for (int i = 0; i < shapes.size(); i++) {
 
-		Shape &s=shapes[i];
-		if (s.bpid>0) {
+		Shape &s = shapes[i];
+		if (s.bpid > 0) {
 			space->get_broadphase()->remove(s.bpid);
-			s.bpid=0;
+			s.bpid = 0;
 		}
 	}
-
 }
 
 void CollisionObjectSW::_update_shapes() {
@@ -129,54 +124,50 @@ void CollisionObjectSW::_update_shapes() {
 	if (!space)
 		return;
 
-	for(int i=0;i<shapes.size();i++) {
+	for (int i = 0; i < shapes.size(); i++) {
 
-		Shape &s=shapes[i];
-		if (s.bpid==0) {
-			s.bpid=space->get_broadphase()->create(this,i);
-			space->get_broadphase()->set_static(s.bpid,_static);
+		Shape &s = shapes[i];
+		if (s.bpid == 0) {
+			s.bpid = space->get_broadphase()->create(this, i);
+			space->get_broadphase()->set_static(s.bpid, _static);
 		}
 
 		//not quite correct, should compute the next matrix..
-		Rect3 shape_aabb=s.shape->get_aabb();
+		Rect3 shape_aabb = s.shape->get_aabb();
 		Transform xform = transform * s.xform;
-		shape_aabb=xform.xform(shape_aabb);
-		s.aabb_cache=shape_aabb;
-		s.aabb_cache=s.aabb_cache.grow( (s.aabb_cache.size.x + s.aabb_cache.size.y)*0.5*0.05 );
+		shape_aabb = xform.xform(shape_aabb);
+		s.aabb_cache = shape_aabb;
+		s.aabb_cache = s.aabb_cache.grow((s.aabb_cache.size.x + s.aabb_cache.size.y) * 0.5 * 0.05);
 
 		Vector3 scale = xform.get_basis().get_scale();
-		s.area_cache=s.shape->get_area()*scale.x*scale.y*scale.z;
+		s.area_cache = s.shape->get_area() * scale.x * scale.y * scale.z;
 
-		space->get_broadphase()->move(s.bpid,s.aabb_cache);
+		space->get_broadphase()->move(s.bpid, s.aabb_cache);
 	}
-
 }
 
-void CollisionObjectSW::_update_shapes_with_motion(const Vector3& p_motion) {
-
+void CollisionObjectSW::_update_shapes_with_motion(const Vector3 &p_motion) {
 
 	if (!space)
 		return;
 
-	for(int i=0;i<shapes.size();i++) {
+	for (int i = 0; i < shapes.size(); i++) {
 
-		Shape &s=shapes[i];
-		if (s.bpid==0) {
-			s.bpid=space->get_broadphase()->create(this,i);
-			space->get_broadphase()->set_static(s.bpid,_static);
+		Shape &s = shapes[i];
+		if (s.bpid == 0) {
+			s.bpid = space->get_broadphase()->create(this, i);
+			space->get_broadphase()->set_static(s.bpid, _static);
 		}
 
 		//not quite correct, should compute the next matrix..
-		Rect3 shape_aabb=s.shape->get_aabb();
+		Rect3 shape_aabb = s.shape->get_aabb();
 		Transform xform = transform * s.xform;
-		shape_aabb=xform.xform(shape_aabb);
-		shape_aabb=shape_aabb.merge(Rect3( shape_aabb.pos+p_motion,shape_aabb.size)); //use motion
-		s.aabb_cache=shape_aabb;
+		shape_aabb = xform.xform(shape_aabb);
+		shape_aabb = shape_aabb.merge(Rect3(shape_aabb.pos + p_motion, shape_aabb.size)); //use motion
+		s.aabb_cache = shape_aabb;
 
-		space->get_broadphase()->move(s.bpid,shape_aabb);
+		space->get_broadphase()->move(s.bpid, shape_aabb);
 	}
-
-
 }
 
 void CollisionObjectSW::_set_space(SpaceSW *p_space) {
@@ -185,25 +176,23 @@ void CollisionObjectSW::_set_space(SpaceSW *p_space) {
 
 		space->remove_object(this);
 
-		for(int i=0;i<shapes.size();i++) {
+		for (int i = 0; i < shapes.size(); i++) {
 
-			Shape &s=shapes[i];
+			Shape &s = shapes[i];
 			if (s.bpid) {
 				space->get_broadphase()->remove(s.bpid);
-				s.bpid=0;
+				s.bpid = 0;
 			}
 		}
-
 	}
 
-	space=p_space;
+	space = p_space;
 
 	if (space) {
 
 		space->add_object(this);
 		_update_shapes();
 	}
-
 }
 
 void CollisionObjectSW::_shape_changed() {
@@ -214,11 +203,11 @@ void CollisionObjectSW::_shape_changed() {
 
 CollisionObjectSW::CollisionObjectSW(Type p_type) {
 
-	_static=true;
-	type=p_type;
-	space=NULL;
-	instance_id=0;
-	layer_mask=1;
-	collision_mask=1;
-	ray_pickable=true;
+	_static = true;
+	type = p_type;
+	space = NULL;
+	instance_id = 0;
+	layer_mask = 1;
+	collision_mask = 1;
+	ray_pickable = true;
 }