1 files changed, 54 insertions, 66 deletions

diff --git a/servers/physics_2d/broad_phase_2d_basic.cpp b/servers/physics_2d/broad_phase_2d_basic.cpp
index e1f6f4f92..c282c0364 100644
--- a/servers/physics_2d/broad_phase_2d_basic.cpp
+++ b/servers/physics_2d/broad_phase_2d_basic.cpp
@@ -30,94 +30,87 @@
 
 BroadPhase2DBasic::ID BroadPhase2DBasic::create(CollisionObject2DSW *p_object_, int p_subindex) {
 
-
 	current++;
 
 	Element e;
-	e.owner=p_object_;
-	e._static=false;
-	e.subindex=p_subindex;
+	e.owner = p_object_;
+	e._static = false;
+	e.subindex = p_subindex;
 
-	element_map[current]=e;
+	element_map[current] = e;
 	return current;
 }
 
-void BroadPhase2DBasic::move(ID p_id, const Rect2& p_aabb) {
+void BroadPhase2DBasic::move(ID p_id, const Rect2 &p_aabb) {
 
-	Map<ID,Element>::Element *E=element_map.find(p_id);
+	Map<ID, Element>::Element *E = element_map.find(p_id);
 	ERR_FAIL_COND(!E);
-	E->get().aabb=p_aabb;
-
+	E->get().aabb = p_aabb;
 }
 void BroadPhase2DBasic::set_static(ID p_id, bool p_static) {
 
-	Map<ID,Element>::Element *E=element_map.find(p_id);
+	Map<ID, Element>::Element *E = element_map.find(p_id);
 	ERR_FAIL_COND(!E);
-	E->get()._static=p_static;
-
+	E->get()._static = p_static;
 }
 void BroadPhase2DBasic::remove(ID p_id) {
 
-	Map<ID,Element>::Element *E=element_map.find(p_id);
+	Map<ID, Element>::Element *E = element_map.find(p_id);
 	ERR_FAIL_COND(!E);
 	element_map.erase(E);
-
 }
 
 CollisionObject2DSW *BroadPhase2DBasic::get_object(ID p_id) const {
 
-	const Map<ID,Element>::Element *E=element_map.find(p_id);
-	ERR_FAIL_COND_V(!E,NULL);
+	const Map<ID, Element>::Element *E = element_map.find(p_id);
+	ERR_FAIL_COND_V(!E, NULL);
 	return E->get().owner;
-
 }
 bool BroadPhase2DBasic::is_static(ID p_id) const {
 
-	const Map<ID,Element>::Element *E=element_map.find(p_id);
-	ERR_FAIL_COND_V(!E,false);
+	const Map<ID, Element>::Element *E = element_map.find(p_id);
+	ERR_FAIL_COND_V(!E, false);
 	return E->get()._static;
-
 }
 int BroadPhase2DBasic::get_subindex(ID p_id) const {
 
-	const Map<ID,Element>::Element *E=element_map.find(p_id);
-	ERR_FAIL_COND_V(!E,-1);
+	const Map<ID, Element>::Element *E = element_map.find(p_id);
+	ERR_FAIL_COND_V(!E, -1);
 	return E->get().subindex;
 }
 
-int BroadPhase2DBasic::cull_segment(const Vector2& p_from, const Vector2& p_to,CollisionObject2DSW** p_results,int p_max_results,int *p_result_indices) {
+int BroadPhase2DBasic::cull_segment(const Vector2 &p_from, const Vector2 &p_to, CollisionObject2DSW **p_results, int p_max_results, int *p_result_indices) {
 
-	int rc=0;
+	int rc = 0;
 
-	for (Map<ID,Element>::Element *E=element_map.front();E;E=E->next()) {
+	for (Map<ID, Element>::Element *E = element_map.front(); E; E = E->next()) {
 
-		const Rect2 aabb=E->get().aabb;
-		if (aabb.intersects_segment(p_from,p_to)) {
+		const Rect2 aabb = E->get().aabb;
+		if (aabb.intersects_segment(p_from, p_to)) {
 
-			p_results[rc]=E->get().owner;
-			p_result_indices[rc]=E->get().subindex;
+			p_results[rc] = E->get().owner;
+			p_result_indices[rc] = E->get().subindex;
 			rc++;
-			if (rc>=p_max_results)
+			if (rc >= p_max_results)
 				break;
 		}
 	}
 
 	return rc;
-
 }
-int BroadPhase2DBasic::cull_aabb(const Rect2& p_aabb,CollisionObject2DSW** p_results,int p_max_results,int *p_result_indices) {
+int BroadPhase2DBasic::cull_aabb(const Rect2 &p_aabb, CollisionObject2DSW **p_results, int p_max_results, int *p_result_indices) {
 
-	int rc=0;
+	int rc = 0;
 
-	for (Map<ID,Element>::Element *E=element_map.front();E;E=E->next()) {
+	for (Map<ID, Element>::Element *E = element_map.front(); E; E = E->next()) {
 
-		const Rect2 aabb=E->get().aabb;
+		const Rect2 aabb = E->get().aabb;
 		if (aabb.intersects(p_aabb)) {
 
-			p_results[rc]=E->get().owner;
-			p_result_indices[rc]=E->get().subindex;
+			p_results[rc] = E->get().owner;
+			p_result_indices[rc] = E->get().subindex;
 			rc++;
-			if (rc>=p_max_results)
+			if (rc >= p_max_results)
 				break;
 		}
 	}
@@ -125,68 +118,63 @@ int BroadPhase2DBasic::cull_aabb(const Rect2& p_aabb,CollisionObject2DSW** p_res
 	return rc;
 }
 
-void BroadPhase2DBasic::set_pair_callback(PairCallback p_pair_callback,void *p_userdata) {
-
-	pair_userdata=p_userdata;
-	pair_callback=p_pair_callback;
+void BroadPhase2DBasic::set_pair_callback(PairCallback p_pair_callback, void *p_userdata) {
 
+	pair_userdata = p_userdata;
+	pair_callback = p_pair_callback;
 }
-void BroadPhase2DBasic::set_unpair_callback(UnpairCallback p_pair_callback,void *p_userdata) {
-
-	unpair_userdata=p_userdata;
-	unpair_callback=p_pair_callback;
+void BroadPhase2DBasic::set_unpair_callback(UnpairCallback p_pair_callback, void *p_userdata) {
 
+	unpair_userdata = p_userdata;
+	unpair_callback = p_pair_callback;
 }
 
 void BroadPhase2DBasic::update() {
 
 	// recompute pairs
-	for(Map<ID,Element>::Element *I=element_map.front();I;I=I->next()) {
+	for (Map<ID, Element>::Element *I = element_map.front(); I; I = I->next()) {
 
-		for(Map<ID,Element>::Element *J=I->next();J;J=J->next()) {
+		for (Map<ID, Element>::Element *J = I->next(); J; J = J->next()) {
 
-			Element *elem_A=&I->get();
-			Element *elem_B=&J->get();
+			Element *elem_A = &I->get();
+			Element *elem_B = &J->get();
 
 			if (elem_A->owner == elem_B->owner)
 				continue;
 
+			bool pair_ok = elem_A->aabb.intersects(elem_B->aabb) && (!elem_A->_static || !elem_B->_static);
 
-			bool pair_ok=elem_A->aabb.intersects( elem_B->aabb ) && (!elem_A->_static || !elem_B->_static );
+			PairKey key(I->key(), J->key());
 
-			PairKey key(I->key(),J->key());
-
-			Map<PairKey,void*>::Element *E=pair_map.find(key);
+			Map<PairKey, void *>::Element *E = pair_map.find(key);
 
 			if (!pair_ok && E) {
 				if (unpair_callback)
-					unpair_callback(elem_A->owner,elem_A->subindex,elem_B->owner,elem_B->subindex,E->get(),unpair_userdata);
+					unpair_callback(elem_A->owner, elem_A->subindex, elem_B->owner, elem_B->subindex, E->get(), unpair_userdata);
 				pair_map.erase(key);
 			}
 
 			if (pair_ok && !E) {
 
-				void *data=NULL;
+				void *data = NULL;
 				if (pair_callback)
-					data=pair_callback(elem_A->owner,elem_A->subindex,elem_B->owner,elem_B->subindex,unpair_userdata);
-				pair_map.insert(key,data);
+					data = pair_callback(elem_A->owner, elem_A->subindex, elem_B->owner, elem_B->subindex, unpair_userdata);
+				pair_map.insert(key, data);
 			}
 		}
 	}
-
 }
 
 BroadPhase2DSW *BroadPhase2DBasic::_create() {
 
-	return memnew( BroadPhase2DBasic );
+	return memnew(BroadPhase2DBasic);
 }
 
 BroadPhase2DBasic::BroadPhase2DBasic() {
 
-	current=1;
-	unpair_callback=NULL;
-	unpair_userdata=NULL;
-	pair_callback=NULL;
-	pair_userdata=NULL;
-
+	current = 1;
+	unpair_callback = NULL;
+	unpair_userdata = NULL;
+	pair_callback = NULL;
+	pair_userdata = NULL;
 }