1 files changed, 58 insertions, 64 deletions

diff --git a/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp b/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
index eed31d839f8..f2e3e18d610 100644
--- a/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
+++ b/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
@@ -27,54 +27,50 @@ struct CONTACT_KEY_TOKEN
 	unsigned int m_key;
 	int m_value;
 	CONTACT_KEY_TOKEN()
-    {
-    }
-
-    CONTACT_KEY_TOKEN(unsigned int key,int token)
-    {
-    	m_key = key;
-    	m_value =  token;
-    }
-
-    CONTACT_KEY_TOKEN(const CONTACT_KEY_TOKEN& rtoken)
-    {
-    	m_key = rtoken.m_key;
-    	m_value = rtoken.m_value;
-    }
-
-    inline bool operator <(const CONTACT_KEY_TOKEN& other) const
+	{
+	}
+
+	CONTACT_KEY_TOKEN(unsigned int key, int token)
+	{
+		m_key = key;
+		m_value = token;
+	}
+
+	CONTACT_KEY_TOKEN(const CONTACT_KEY_TOKEN& rtoken)
+	{
+		m_key = rtoken.m_key;
+		m_value = rtoken.m_value;
+	}
+
+	inline bool operator<(const CONTACT_KEY_TOKEN& other) const
 	{
 		return (m_key < other.m_key);
 	}
 
-	inline bool operator >(const CONTACT_KEY_TOKEN& other) const
+	inline bool operator>(const CONTACT_KEY_TOKEN& other) const
 	{
 		return (m_key > other.m_key);
 	}
-
 };
 
 class CONTACT_KEY_TOKEN_COMP
 {
-	public:
-
-		bool operator() ( const CONTACT_KEY_TOKEN& a, const CONTACT_KEY_TOKEN& b ) const
-		{
-			return ( a < b );
-		}
+public:
+	bool operator()(const CONTACT_KEY_TOKEN& a, const CONTACT_KEY_TOKEN& b) const
+	{
+		return (a < b);
+	}
 };
 
-
 void btContactArray::merge_contacts(
-	const btContactArray & contacts, bool normal_contact_average)
+	const btContactArray& contacts, bool normal_contact_average)
 {
 	clear();
 
 	int i;
-	if(contacts.size()==0) return;
-
+	if (contacts.size() == 0) return;
 
-	if(contacts.size()==1)
+	if (contacts.size() == 1)
 	{
 		push_back(contacts[0]);
 		return;
@@ -86,16 +82,16 @@ void btContactArray::merge_contacts(
 
 	//fill key contacts
 
-	for ( i = 0;i<contacts.size() ;i++ )
+	for (i = 0; i < contacts.size(); i++)
 	{
-		keycontacts.push_back(CONTACT_KEY_TOKEN(contacts[i].calc_key_contact(),i));
+		keycontacts.push_back(CONTACT_KEY_TOKEN(contacts[i].calc_key_contact(), i));
 	}
 
 	//sort keys
 	keycontacts.quickSort(CONTACT_KEY_TOKEN_COMP());
 
 	// Merge contacts
-	int coincident_count=0;
+	int coincident_count = 0;
 	btVector3 coincident_normals[MAX_COINCIDENT];
 
 	unsigned int last_key = keycontacts[0].m_key;
@@ -103,56 +99,56 @@ void btContactArray::merge_contacts(
 
 	push_back(contacts[keycontacts[0].m_value]);
 
-	GIM_CONTACT * pcontact = &(*this)[0];
+	GIM_CONTACT* pcontact = &(*this)[0];
 
-	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 = &(*this)[this->size()-1];
-        }
+			push_back(*scontact);
+			pcontact = &(*this)[this->size() - 1];
+		}
 		last_key = key;
 	}
 }
 
-void btContactArray::merge_contacts_unique(const btContactArray & contacts)
+void btContactArray::merge_contacts_unique(const btContactArray& contacts)
 {
 	clear();
 
-	if(contacts.size()==0) return;
+	if (contacts.size() == 0) return;
 
-	if(contacts.size()==1)
+	if (contacts.size() == 1)
 	{
 		push_back(contacts[0]);
 		return;
@@ -160,14 +156,14 @@ void btContactArray::merge_contacts_unique(const btContactArray & contacts)
 
 	GIM_CONTACT average_contact = contacts[0];
 
-	for (int i=1;i<contacts.size() ;i++ )
+	for (int 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
-	btScalar divide_average = 1.0f/((btScalar)contacts.size());
+	btScalar divide_average = 1.0f / ((btScalar)contacts.size());
 
 	average_contact.m_point *= divide_average;
 
@@ -176,6 +172,4 @@ void btContactArray::merge_contacts_unique(const btContactArray & contacts)
 	average_contact.m_depth = average_contact.m_normal.length();
 
 	average_contact.m_normal /= average_contact.m_depth;
-
 }
-