diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-03-07 21:53:16 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-03-07 21:53:16 +0400 |
| commit | 643b0be4cb3f73bd876493d2a7bd6f76ef27cf06 (patch) | |
| tree | 33fa8c08a902176f4204b6cc6a18702997bd90ba /extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h | |
| parent | 46d32c89f6df911120579d00dd6e1246536cb6d8 (diff) | |
bullet: Update to current svn, r2636
Apply patches in patches directory, remove patches that were applied
upstream.
If you made changes without adding a patch, please check.
Fixes [#32233] exporting bullet format results in corrupt files.
Diffstat (limited to 'extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h index 0ce9dd25926..e40fb1d3db6 100644 --- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h +++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h @@ -44,9 +44,9 @@ class btManifoldPoint public: btManifoldPoint() :m_userPersistentData(0), - m_appliedImpulse(0.f), m_lateralFrictionInitialized(false), - m_appliedImpulseLateral1(0.f), + m_appliedImpulse(0.f), + m_appliedImpulseLateral1(0.f), m_appliedImpulseLateral2(0.f), m_contactMotion1(0.f), m_contactMotion2(0.f), @@ -64,11 +64,12 @@ class btManifoldPoint m_normalWorldOnB( normal ), m_distance1( distance ), m_combinedFriction(btScalar(0.)), + m_combinedRollingFriction(btScalar(0.)), m_combinedRestitution(btScalar(0.)), m_userPersistentData(0), - m_appliedImpulse(0.f), m_lateralFrictionInitialized(false), - m_appliedImpulseLateral1(0.f), + m_appliedImpulse(0.f), + m_appliedImpulseLateral1(0.f), m_appliedImpulseLateral2(0.f), m_contactMotion1(0.f), m_contactMotion2(0.f), @@ -76,9 +77,7 @@ class btManifoldPoint m_contactCFM2(0.f), m_lifeTime(0) { - mConstraintRow[0].m_accumImpulse = 0.f; - mConstraintRow[1].m_accumImpulse = 0.f; - mConstraintRow[2].m_accumImpulse = 0.f; + } @@ -92,18 +91,19 @@ class btManifoldPoint btScalar m_distance1; btScalar m_combinedFriction; + btScalar m_combinedRollingFriction; btScalar m_combinedRestitution; - //BP mod, store contact triangles. - int m_partId0; - int m_partId1; - int m_index0; - int m_index1; + //BP mod, store contact triangles. + int m_partId0; + int m_partId1; + int m_index0; + int m_index1; mutable void* m_userPersistentData; - btScalar m_appliedImpulse; - bool m_lateralFrictionInitialized; + + btScalar m_appliedImpulse; btScalar m_appliedImpulseLateral1; btScalar m_appliedImpulseLateral2; btScalar m_contactMotion1; @@ -118,8 +118,6 @@ class btManifoldPoint - btConstraintRow mConstraintRow[3]; - btScalar getDistance() const { |