diff options
| author | Benoit Bolsee <benoit.bolsee@online.be> | 2009-12-22 22:52:14 +0300 |
|---|---|---|
| committer | Benoit Bolsee <benoit.bolsee@online.be> | 2009-12-22 22:52:14 +0300 |
| commit | 7e498afe330021eb868dcfec8a55b02f2cb5955c (patch) | |
| tree | 45b9cff937f120921cced59705178bd20cc1592b /extern/bullet2 | |
| parent | c033bf8957a4a00fa378d1b3d3e951bd8f2e2970 (diff) | |
Bullet: synchronize soft body helpers with current SVN.
Diffstat (limited to 'extern/bullet2')
| -rw-r--r-- | extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp | 15 | ||||
| -rw-r--r-- | extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h | 6 |
2 files changed, 14 insertions, 7 deletions
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp index 4f81b0953a2..61aac5b4ce5 100644 --- a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp +++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp @@ -793,7 +793,7 @@ btSoftBody* btSoftBodyHelpers::CreateEllipsoid(btSoftBodyWorldInfo& worldInfo,c // btSoftBody* btSoftBodyHelpers::CreateFromTriMesh(btSoftBodyWorldInfo& worldInfo,const btScalar* vertices, const int* triangles, - int ntriangles) + int ntriangles, bool randomizeConstraints) { int maxidx=0; int i,j,ni; @@ -828,14 +828,16 @@ btSoftBody* btSoftBodyHelpers::CreateFromTriMesh(btSoftBodyWorldInfo& worldInfo #undef IDX psb->appendFace(idx[0],idx[1],idx[2]); } - // don't randomize now, let's give a chance to the application to set face data - //psb->randomizeConstraints(); + if (randomizeConstraints) + { + psb->randomizeConstraints(); + } return(psb); } // btSoftBody* btSoftBodyHelpers::CreateFromConvexHull(btSoftBodyWorldInfo& worldInfo, const btVector3* vertices, - int nvertices) + int nvertices, bool randomizeConstraints) { HullDesc hdsc(QF_TRIANGLES,nvertices,vertices); HullResult hres; @@ -855,6 +857,9 @@ btSoftBody* btSoftBodyHelpers::CreateFromConvexHull(btSoftBodyWorldInfo& worldI psb->appendFace(idx[0],idx[1],idx[2]); } hlib.ReleaseResult(hres); - psb->randomizeConstraints(); + if (randomizeConstraints) + { + psb->randomizeConstraints(); + } return(psb); } diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h index 0e3b50397ee..5eb2ebc0735 100644 --- a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h +++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h @@ -109,11 +109,13 @@ struct btSoftBodyHelpers static btSoftBody* CreateFromTriMesh( btSoftBodyWorldInfo& worldInfo, const btScalar* vertices, const int* triangles, - int ntriangles); + int ntriangles, + bool randomizeConstraints = true); /* Create from convex-hull */ static btSoftBody* CreateFromConvexHull( btSoftBodyWorldInfo& worldInfo, const btVector3* vertices, - int nvertices); + int nvertices, + bool randomizeConstraints = true); }; #endif //SOFT_BODY_HELPERS_H |