1 files changed, 25 insertions, 28 deletions

diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
index 46ce1ab75e7..d1bbb1a46ee 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
@@ -13,7 +13,6 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-
 #ifndef BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
 #define BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
 
@@ -27,62 +26,60 @@ subject to the following restrictions:
 /// by taking closestPointInA = closestPointInB + m_distance * m_normalOnSurfaceB
 struct btDiscreteCollisionDetectorInterface
 {
-	
 	struct Result
 	{
-	
-		virtual ~Result(){}	
+		virtual ~Result() {}
 
 		///setShapeIdentifiersA/B provides experimental support for per-triangle material / custom material combiner
-		virtual void setShapeIdentifiersA(int partId0,int index0)=0;
-		virtual void setShapeIdentifiersB(int partId1,int index1)=0;
-		virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth)=0;
+		virtual void setShapeIdentifiersA(int partId0, int index0) = 0;
+		virtual void setShapeIdentifiersB(int partId1, int index1) = 0;
+		virtual void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar depth) = 0;
 	};
 
 	struct ClosestPointInput
 	{
 		ClosestPointInput()
-			:m_maximumDistanceSquared(btScalar(BT_LARGE_FLOAT))
+			: m_maximumDistanceSquared(btScalar(BT_LARGE_FLOAT))
 		{
 		}
 
 		btTransform m_transformA;
 		btTransform m_transformB;
-		btScalar	m_maximumDistanceSquared;
+		btScalar m_maximumDistanceSquared;
 	};
 
-	virtual ~btDiscreteCollisionDetectorInterface() {};
+	virtual ~btDiscreteCollisionDetectorInterface(){};
 
 	//
 	// give either closest points (distance > 0) or penetration (distance)
 	// the normal always points from B towards A
 	//
-	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false) = 0;
-
+	virtual void getClosestPoints(const ClosestPointInput& input, Result& output, class btIDebugDraw* debugDraw, bool swapResults = false) = 0;
 };
 
 struct btStorageResult : public btDiscreteCollisionDetectorInterface::Result
 {
-		btVector3	m_normalOnSurfaceB;
-		btVector3	m_closestPointInB;
-		btScalar	m_distance; //negative means penetration !
+	btVector3 m_normalOnSurfaceB;
+	btVector3 m_closestPointInB;
+	btScalar m_distance;  //negative means penetration !
 
-		btStorageResult() : m_distance(btScalar(BT_LARGE_FLOAT))
-		{
+protected:
+	btStorageResult() : m_distance(btScalar(BT_LARGE_FLOAT))
+	{
+	}
 
-		}
-		virtual ~btStorageResult() {};
+public:
+	virtual ~btStorageResult(){};
 
-		virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth)
+	virtual void addContactPoint(const btVector3& normalOnBInWorld, const btVector3& pointInWorld, btScalar depth)
+	{
+		if (depth < m_distance)
 		{
-			if (depth < m_distance)
-			{
-				m_normalOnSurfaceB = normalOnBInWorld;
-				m_closestPointInB = pointInWorld;
-				m_distance = depth;
-			}
+			m_normalOnSurfaceB = normalOnBInWorld;
+			m_closestPointInB = pointInWorld;
+			m_distance = depth;
 		}
+	}
 };
 
-#endif //BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
-
+#endif  //BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H