diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-10-25 07:43:20 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-10-25 07:43:20 +0400 |
| commit | 472a021aca3c0a6278151f7abee4e0970b026e3f (patch) | |
| tree | 3456ce084e33450cc21c68beca1bd407801bf256 /extern/bullet2/src/BulletSoftBody/btSoftBody.h | |
| parent | 4514eeaa8e335a86de0bda68aa4814c0bafad7eb (diff) | |
bullet: Update to version 2.82 (bullet revision 2705)
Remove patch that has been applied upstream.
Fixes several bugs.
Diffstat (limited to 'extern/bullet2/src/BulletSoftBody/btSoftBody.h')
| -rw-r--r-- | extern/bullet2/src/BulletSoftBody/btSoftBody.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBody.h b/extern/bullet2/src/BulletSoftBody/btSoftBody.h index 2116c34f06d..ee1a3d95228 100644 --- a/extern/bullet2/src/BulletSoftBody/btSoftBody.h +++ b/extern/bullet2/src/BulletSoftBody/btSoftBody.h @@ -45,6 +45,7 @@ struct btSoftBodyWorldInfo btScalar air_density; btScalar water_density; btScalar water_offset; + btScalar m_maxDisplacement; btVector3 water_normal; btBroadphaseInterface* m_broadphase; btDispatcher* m_dispatcher; @@ -55,6 +56,7 @@ struct btSoftBodyWorldInfo :air_density((btScalar)1.2), water_density(0), water_offset(0), + m_maxDisplacement(1000.f),//avoid soft body from 'exploding' so use some upper threshold of maximum motion that a node can travel per frame water_normal(0,0,0), m_broadphase(0), m_dispatcher(0), |