1 files changed, 35 insertions, 39 deletions

diff --git a/thirdparty/bullet/BulletCollision/Gimpact/gim_contact.cpp b/thirdparty/bullet/BulletCollision/Gimpact/gim_contact.cpp
index 20e41de089..390225709e 100644
--- a/thirdparty/bullet/BulletCollision/Gimpact/gim_contact.cpp
+++ b/thirdparty/bullet/BulletCollision/Gimpact/gim_contact.cpp
@@ -33,91 +33,89 @@ email: projectileman@yahoo.com
 #define MAX_COINCIDENT 8
 
 void gim_contact_array::merge_contacts(
-	const gim_contact_array & contacts, bool normal_contact_average)
+	const gim_contact_array& contacts, bool normal_contact_average)
 {
 	clear();
 
-	if(contacts.size()==1)
+	if (contacts.size() == 1)
 	{
 		push_back(contacts.back());
 		return;
 	}
 
 	gim_array<GIM_RSORT_TOKEN> keycontacts(contacts.size());
-	keycontacts.resize(contacts.size(),false);
+	keycontacts.resize(contacts.size(), false);
 
 	//fill key contacts
 
 	GUINT i;
 
-	for (i = 0;i<contacts.size() ;i++ )
+	for (i = 0; i < contacts.size(); i++)
 	{
 		keycontacts[i].m_key = contacts[i].calc_key_contact();
 		keycontacts[i].m_value = i;
 	}
 
 	//sort keys
-	gim_heap_sort(keycontacts.pointer(),keycontacts.size(),GIM_RSORT_TOKEN_COMPARATOR());
+	gim_heap_sort(keycontacts.pointer(), keycontacts.size(), GIM_RSORT_TOKEN_COMPARATOR());
 
 	// Merge contacts
 
-	GUINT coincident_count=0;
+	GUINT coincident_count = 0;
 	btVector3 coincident_normals[MAX_COINCIDENT];
 
 	GUINT last_key = keycontacts[0].m_key;
 	GUINT key = 0;
 
 	push_back(contacts[keycontacts[0].m_value]);
-	GIM_CONTACT * pcontact = &back();
+	GIM_CONTACT* pcontact = &back();
 
-
-
-	for( i=1;i<keycontacts.size();i++)
+	for (i = 1; i < keycontacts.size(); i++)
 	{
-	    key = keycontacts[i].m_key;
-		const GIM_CONTACT * scontact = &contacts[keycontacts[i].m_value];
+		key = keycontacts[i].m_key;
+		const GIM_CONTACT* scontact = &contacts[keycontacts[i].m_value];
 
-		if(last_key ==  key)//same points
+		if (last_key == key)  //same points
 		{
 			//merge contact
-			if(pcontact->m_depth - CONTACT_DIFF_EPSILON > scontact->m_depth)//)
+			if (pcontact->m_depth - CONTACT_DIFF_EPSILON > scontact->m_depth)  //)
 			{
 				*pcontact = *scontact;
-                coincident_count = 0;
+				coincident_count = 0;
 			}
-			else if(normal_contact_average)
+			else if (normal_contact_average)
 			{
-				if(btFabs(pcontact->m_depth - scontact->m_depth)<CONTACT_DIFF_EPSILON)
-                {
-                    if(coincident_count<MAX_COINCIDENT)
-                    {
-                    	coincident_normals[coincident_count] = scontact->m_normal;
-                        coincident_count++;
-                    }
-                }
+				if (btFabs(pcontact->m_depth - scontact->m_depth) < CONTACT_DIFF_EPSILON)
+				{
+					if (coincident_count < MAX_COINCIDENT)
+					{
+						coincident_normals[coincident_count] = scontact->m_normal;
+						coincident_count++;
+					}
+				}
 			}
 		}
 		else
-		{//add new contact
+		{  //add new contact
 
-		    if(normal_contact_average && coincident_count>0)
-		    {
-		    	pcontact->interpolate_normals(coincident_normals,coincident_count);
-		        coincident_count = 0;
-		    }
+			if (normal_contact_average && coincident_count > 0)
+			{
+				pcontact->interpolate_normals(coincident_normals, coincident_count);
+				coincident_count = 0;
+			}
 
-		    push_back(*scontact);
-		    pcontact = &back();
-        }
+			push_back(*scontact);
+			pcontact = &back();
+		}
 		last_key = key;
 	}
 }
 
-void gim_contact_array::merge_contacts_unique(const gim_contact_array & contacts)
+void gim_contact_array::merge_contacts_unique(const gim_contact_array& contacts)
 {
 	clear();
 
-	if(contacts.size()==1)
+	if (contacts.size() == 1)
 	{
 		push_back(contacts.back());
 		return;
@@ -125,14 +123,14 @@ void gim_contact_array::merge_contacts_unique(const gim_contact_array & contacts
 
 	GIM_CONTACT average_contact = contacts.back();
 
-	for (GUINT i=1;i<contacts.size() ;i++ )
+	for (GUINT i = 1; i < contacts.size(); i++)
 	{
 		average_contact.m_point += contacts[i].m_point;
 		average_contact.m_normal += contacts[i].m_normal * contacts[i].m_depth;
 	}
 
 	//divide
-	GREAL divide_average = 1.0f/((GREAL)contacts.size());
+	GREAL divide_average = 1.0f / ((GREAL)contacts.size());
 
 	average_contact.m_point *= divide_average;
 
@@ -141,6 +139,4 @@ void gim_contact_array::merge_contacts_unique(const gim_contact_array & contacts
 	average_contact.m_depth = average_contact.m_normal.length();
 
 	average_contact.m_normal /= average_contact.m_depth;
-
 }
-