Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h
- Timestamp:
- Apr 21, 2011, 6:58:23 PM (13 years ago)
- Location:
- code/branches/kicklib2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib2
- Property svn:mergeinfo changed
-
code/branches/kicklib2/src/external/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h
r5781 r8284 27 27 28 28 ///1D constraint along a normal axis between bodyA and bodyB. It can be combined to solve contact and friction constraints. 29 ATTRIBUTE_ALIGNED 16(struct) btSolverConstraint29 ATTRIBUTE_ALIGNED64 (struct) btSolverConstraint 30 30 { 31 31 BT_DECLARE_ALIGNED_ALLOCATOR(); … … 59 59 union 60 60 { 61 int m_solverBodyIdA;62 btScalar m_unusedPadding2;61 btRigidBody* m_solverBodyA; 62 int m_companionIdA; 63 63 }; 64 64 union 65 65 { 66 int m_solverBodyIdB;67 btScalar m_unusedPadding3;66 btRigidBody* m_solverBodyB; 67 int m_companionIdB; 68 68 }; 69 69 … … 78 78 btScalar m_lowerLimit; 79 79 btScalar m_upperLimit; 80 81 btScalar m_rhsPenetration; 80 82 81 83 enum btSolverConstraintType
Note: See TracChangeset
for help on using the changeset viewer.