1 files changed, 40 insertions, 54 deletions

diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGearConstraint.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGearConstraint.h
index e4613455a2..64b15dfbce 100644
--- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGearConstraint.h
+++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btGearConstraint.h
@@ -13,45 +13,40 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-
-
 #ifndef BT_GEAR_CONSTRAINT_H
 #define BT_GEAR_CONSTRAINT_H
 
 #include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
 
-
 #ifdef BT_USE_DOUBLE_PRECISION
-#define btGearConstraintData	btGearConstraintDoubleData
-#define btGearConstraintDataName	"btGearConstraintDoubleData"
+#define btGearConstraintData btGearConstraintDoubleData
+#define btGearConstraintDataName "btGearConstraintDoubleData"
 #else
-#define btGearConstraintData	btGearConstraintFloatData
-#define btGearConstraintDataName	"btGearConstraintFloatData"
-#endif //BT_USE_DOUBLE_PRECISION
-
-
+#define btGearConstraintData btGearConstraintFloatData
+#define btGearConstraintDataName "btGearConstraintFloatData"
+#endif  //BT_USE_DOUBLE_PRECISION
 
 ///The btGeatConstraint will couple the angular velocity for two bodies around given local axis and ratio.
 ///See Bullet/Demos/ConstraintDemo for an example use.
 class btGearConstraint : public btTypedConstraint
 {
 protected:
-	btVector3	m_axisInA;
-	btVector3	m_axisInB;
-	bool		m_useFrameA;
-	btScalar	m_ratio;
+	btVector3 m_axisInA;
+	btVector3 m_axisInB;
+	bool m_useFrameA;
+	btScalar m_ratio;
 
 public:
-	btGearConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& axisInA,const btVector3& axisInB, btScalar ratio=1.f);
-	virtual ~btGearConstraint ();
+	btGearConstraint(btRigidBody& rbA, btRigidBody& rbB, const btVector3& axisInA, const btVector3& axisInB, btScalar ratio = 1.f);
+	virtual ~btGearConstraint();
 
 	///internal method used by the constraint solver, don't use them directly
-	virtual void getInfo1 (btConstraintInfo1* info);
+	virtual void getInfo1(btConstraintInfo1* info);
 
 	///internal method used by the constraint solver, don't use them directly
-	virtual void getInfo2 (btConstraintInfo2* info);
+	virtual void getInfo2(btConstraintInfo2* info);
 
-	void setAxisA(btVector3& axisA) 
+	void setAxisA(btVector3& axisA)
 	{
 		m_axisInA = axisA;
 	}
@@ -76,68 +71,64 @@ public:
 		return m_ratio;
 	}
 
-
-	virtual	void	setParam(int num, btScalar value, int axis = -1) 
+	virtual void setParam(int num, btScalar value, int axis = -1)
 	{
-		(void) num;
-		(void) value;
-		(void) axis;
+		(void)num;
+		(void)value;
+		(void)axis;
 		btAssert(0);
 	}
 
 	///return the local value of parameter
-	virtual	btScalar getParam(int num, int axis = -1) const 
-	{ 
-		(void) num;
-		(void) axis;
+	virtual btScalar getParam(int num, int axis = -1) const
+	{
+		(void)num;
+		(void)axis;
 		btAssert(0);
 		return 0.f;
 	}
 
-	virtual	int	calculateSerializeBufferSize() const;
+	virtual int calculateSerializeBufferSize() const;
 
 	///fills the dataBuffer and returns the struct name (and 0 on failure)
-	virtual	const char*	serialize(void* dataBuffer, btSerializer* serializer) const;
+	virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
 };
 
-
-
-
 ///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
 struct btGearConstraintFloatData
 {
-	btTypedConstraintFloatData	m_typeConstraintData;
+	btTypedConstraintFloatData m_typeConstraintData;
 
-	btVector3FloatData			m_axisInA;
-	btVector3FloatData			m_axisInB;
+	btVector3FloatData m_axisInA;
+	btVector3FloatData m_axisInB;
 
-	float							m_ratio;
-	char							m_padding[4];
+	float m_ratio;
+	char m_padding[4];
 };
 
 struct btGearConstraintDoubleData
 {
-	btTypedConstraintDoubleData	m_typeConstraintData;
+	btTypedConstraintDoubleData m_typeConstraintData;
 
-	btVector3DoubleData			m_axisInA;
-	btVector3DoubleData			m_axisInB;
+	btVector3DoubleData m_axisInA;
+	btVector3DoubleData m_axisInB;
 
-	double						m_ratio;
+	double m_ratio;
 };
 
-SIMD_FORCE_INLINE	int	btGearConstraint::calculateSerializeBufferSize() const
+SIMD_FORCE_INLINE int btGearConstraint::calculateSerializeBufferSize() const
 {
 	return sizeof(btGearConstraintData);
 }
 
-	///fills the dataBuffer and returns the struct name (and 0 on failure)
-SIMD_FORCE_INLINE	const char*	btGearConstraint::serialize(void* dataBuffer, btSerializer* serializer) const
+///fills the dataBuffer and returns the struct name (and 0 on failure)
+SIMD_FORCE_INLINE const char* btGearConstraint::serialize(void* dataBuffer, btSerializer* serializer) const
 {
 	btGearConstraintData* gear = (btGearConstraintData*)dataBuffer;
-	btTypedConstraint::serialize(&gear->m_typeConstraintData,serializer);
+	btTypedConstraint::serialize(&gear->m_typeConstraintData, serializer);
 
-	m_axisInA.serialize( gear->m_axisInA );
-	m_axisInB.serialize( gear->m_axisInB );
+	m_axisInA.serialize(gear->m_axisInA);
+	m_axisInB.serialize(gear->m_axisInB);
 
 	gear->m_ratio = m_ratio;
 
@@ -152,9 +143,4 @@ SIMD_FORCE_INLINE	const char*	btGearConstraint::serialize(void* dataBuffer, btSe
 	return btGearConstraintDataName;
 }
 
-
-
-
-
-
-#endif //BT_GEAR_CONSTRAINT_H
+#endif  //BT_GEAR_CONSTRAINT_H