diff options
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h index 867d62a301d..79e45a4383b 100644 --- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h +++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h @@ -26,7 +26,7 @@ class btRigidBody; ///1D constraint along a normal axis between bodyA and bodyB. It can be combined to solve contact and friction constraints. -ATTRIBUTE_ALIGNED16 (struct) btSolverConstraint +ATTRIBUTE_ALIGNED64 (struct) btSolverConstraint { BT_DECLARE_ALIGNED_ALLOCATOR(); @@ -58,13 +58,13 @@ ATTRIBUTE_ALIGNED16 (struct) btSolverConstraint }; union { - int m_solverBodyIdA; - btScalar m_unusedPadding2; + btRigidBody* m_solverBodyA; + int m_companionIdA; }; union { - int m_solverBodyIdB; - btScalar m_unusedPadding3; + btRigidBody* m_solverBodyB; + int m_companionIdB; }; union @@ -78,6 +78,8 @@ ATTRIBUTE_ALIGNED16 (struct) btSolverConstraint btScalar m_lowerLimit; btScalar m_upperLimit; + btScalar m_rhsPenetration; + enum btSolverConstraintType { BT_SOLVER_CONTACT_1D = 0, |