Merge pull request #24740 from OBKF/update-bullet-physics

Update Bullet physics to commit 126b676

1 files changed, 8 insertions, 14 deletions

diff --git a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.h b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.h
index b418f29ec4..8281aee05d 100644
--- a/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.h
+++ b/thirdparty/bullet/Bullet3OpenCL/RigidBody/b3GpuJacobiContactSolver.h
@@ -8,7 +8,6 @@
 #include "Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h"
 #include "Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h"
 
-
 //struct b3InertiaData;
 //b3InertiaData
 
@@ -21,21 +20,20 @@ struct b3JacobiSolverInfo
 	float m_deltaTime;
 	float m_positionDrift;
 	float m_positionConstraintCoeff;
-	int	m_numIterations;
+	int m_numIterations;
 
 	b3JacobiSolverInfo()
-		:m_fixedBodyIndex(0),
-		m_deltaTime(1./60.f),
-		m_positionDrift( 0.005f ), 
-		m_positionConstraintCoeff( 0.99f ),
-		m_numIterations(7)
+		: m_fixedBodyIndex(0),
+		  m_deltaTime(1. / 60.f),
+		  m_positionDrift(0.005f),
+		  m_positionConstraintCoeff(0.99f),
+		  m_numIterations(7)
 	{
 	}
 };
 class b3GpuJacobiContactSolver
 {
 protected:
-
 	struct b3GpuJacobiSolverInternalData* m_data;
 
 	cl_context m_context;
@@ -43,20 +41,16 @@ protected:
 	cl_command_queue m_queue;
 
 public:
-
 	b3GpuJacobiContactSolver(cl_context ctx, cl_device_id device, cl_command_queue queue, int pairCapacity);
 	virtual ~b3GpuJacobiContactSolver();
 
-
 	void solveContacts(int numBodies, cl_mem bodyBuf, cl_mem inertiaBuf, int numContacts, cl_mem contactBuf, const struct b3Config& config, int static0Index);
-	void solveGroupHost(b3RigidBodyData* bodies,b3InertiaData* inertias,int numBodies,struct b3Contact4* manifoldPtr, int numManifolds,const b3JacobiSolverInfo& solverInfo);
+	void solveGroupHost(b3RigidBodyData* bodies, b3InertiaData* inertias, int numBodies, struct b3Contact4* manifoldPtr, int numManifolds, const b3JacobiSolverInfo& solverInfo);
 	//void  solveGroupHost(btRigidBodyCL* bodies,b3InertiaData* inertias,int numBodies,btContact4* manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btJacobiSolverInfo& solverInfo);
 
 	//b3Scalar solveGroup(b3OpenCLArray<b3RigidBodyData>* gpuBodies,b3OpenCLArray<b3InertiaData>* gpuInertias, int numBodies,b3OpenCLArray<b3GpuGenericConstraint>* gpuConstraints,int numConstraints,const b3ContactSolverInfo& infoGlobal);
 
 	//void  solveGroup(btOpenCLArray<btRigidBodyCL>* bodies,btOpenCLArray<btInertiaCL>* inertias,btOpenCLArray<btContact4>* manifoldPtr,const btJacobiSolverInfo& solverInfo);
 	//void  solveGroupMixed(btOpenCLArray<btRigidBodyCL>* bodies,btOpenCLArray<btInertiaCL>* inertias,btOpenCLArray<btContact4>* manifoldPtr,const btJacobiSolverInfo& solverInfo);
-
 };
-#endif //B3_GPU_JACOBI_CONTACT_SOLVER_H
-
+#endif  //B3_GPU_JACOBI_CONTACT_SOLVER_H