diff options
Diffstat (limited to 'extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h index f1f40ffdf19..2c71360c5b9 100644 --- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h +++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h @@ -1,5 +1,3 @@ - - /* Bullet Continuous Collision Detection and Physics Library Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/ @@ -27,24 +25,34 @@ 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 { + BT_DECLARE_ALIGNED_ALLOCATOR(); + btVector3 m_relpos1CrossNormal; - btVector3 m_relpos2CrossNormal; btVector3 m_contactNormal; + + btVector3 m_relpos2CrossNormal; btVector3 m_angularComponentA; + btVector3 m_angularComponentB; - btScalar m_appliedVelocityImpulse; + mutable btScalar m_appliedPushImpulse; + + mutable btScalar m_appliedImpulse; int m_solverBodyIdA; int m_solverBodyIdB; + btScalar m_friction; btScalar m_restitution; btScalar m_jacDiagABInv; btScalar m_penetration; - btScalar m_appliedImpulse; + + int m_constraintType; int m_frictionIndex; - int m_unusedPadding[2]; + void* m_originalContactPoint; + int m_unusedPadding[1]; + enum btSolverConstraintType { @@ -61,3 +69,4 @@ ATTRIBUTE_ALIGNED16 (struct) btSolverConstraint #endif //BT_SOLVER_CONSTRAINT_H + |