diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2011-03-12 23:34:17 +0300 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2011-03-12 23:34:17 +0300 |
commit | 5e374328a87c1b418f8454d5ef38470484804961 (patch) | |
tree | 1d6de85165175c5192f74dbd423e1d5cb48f8ff6 /extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h | |
parent | 8c526e79e31d40d56a6fecce9343c74bd9fe62d8 (diff) |
update Bullet physics sdk to latest trunk/version 2.78
add PhysicsConstraints.exportBulletFile(char* fileName) python command
I'll be checking the bf-committers mailing list, in case this commit broke stuff
scons needs to be updated, I'll do that in a second.
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, |