diff options
Diffstat (limited to 'thirdparty/bullet/Bullet3Dynamics/shared/b3ContactConstraint4.h')
| -rw-r--r-- | thirdparty/bullet/Bullet3Dynamics/shared/b3ContactConstraint4.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/thirdparty/bullet/Bullet3Dynamics/shared/b3ContactConstraint4.h b/thirdparty/bullet/Bullet3Dynamics/shared/b3ContactConstraint4.h index 68cf65e312..cf2eed0e7c 100644 --- a/thirdparty/bullet/Bullet3Dynamics/shared/b3ContactConstraint4.h +++ b/thirdparty/bullet/Bullet3Dynamics/shared/b3ContactConstraint4.h @@ -5,30 +5,27 @@ typedef struct b3ContactConstraint4 b3ContactConstraint4_t; - struct b3ContactConstraint4 { - - b3Float4 m_linear;//normal? + b3Float4 m_linear; //normal? b3Float4 m_worldPos[4]; - b3Float4 m_center; // friction + b3Float4 m_center; // friction float m_jacCoeffInv[4]; float m_b[4]; float m_appliedRambdaDt[4]; - float m_fJacCoeffInv[2]; // friction - float m_fAppliedRambdaDt[2]; // friction + float m_fJacCoeffInv[2]; // friction + float m_fAppliedRambdaDt[2]; // friction unsigned int m_bodyA; unsigned int m_bodyB; - int m_batchIdx; + int m_batchIdx; unsigned int m_paddings; - }; //inline void setFrictionCoeff(float value) { m_linear[3] = value; } -inline float b3GetFrictionCoeff(b3ContactConstraint4_t* constraint) +inline float b3GetFrictionCoeff(b3ContactConstraint4_t* constraint) { - return constraint->m_linear.w; + return constraint->m_linear.w; } -#endif //B3_CONTACT_CONSTRAINT5_H +#endif //B3_CONTACT_CONSTRAINT5_H |