diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2008-09-17 23:47:26 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2008-09-17 23:47:26 +0400 |
| commit | 015a42079c299f4256240dc347de8ccfa474514a (patch) | |
| tree | 439345b1477a9c071966efefa8fa5ee53ebda989 /extern | |
| parent | 0a6d2e26a9eaeaf413c78e1f144fdcfe847fa317 (diff) | |
Please add extern/bullet2/src/LinearMath/btConvexHull.cpp to your build system!
Reverted back to original Bullet version.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp index 900ab85497d..d9919967233 100644 --- a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp +++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp @@ -278,7 +278,7 @@ void btSoftBodyHelpers::Draw( btSoftBody* psb, HullResult hres; HullLibrary hlib; hdsc.mMaxVertices=vertices.size(); - //hlib.CreateConvexHull(hdsc,hres); + hlib.CreateConvexHull(hdsc,hres); const btVector3 center=average(hres.m_OutputVertices); add(hres.m_OutputVertices,-center); mul(hres.m_OutputVertices,(btScalar)1); @@ -291,7 +291,7 @@ void btSoftBodyHelpers::Draw( btSoftBody* psb, hres.m_OutputVertices[idx[2]], color,1); } - //hlib.ReleaseResult(hres); + hlib.ReleaseResult(hres); } /* Velocities */ #if 0 @@ -634,7 +634,7 @@ btSoftBody* btSoftBodyHelpers::CreateFromConvexHull(btSoftBodyWorldInfo& worldI HullResult hres; HullLibrary hlib;/*??*/ hdsc.mMaxVertices=nvertices; - //hlib.CreateConvexHull(hdsc,hres); + hlib.CreateConvexHull(hdsc,hres); btSoftBody* psb=new btSoftBody(&worldInfo,(int)hres.mNumOutputVertices, &hres.m_OutputVertices[0],0); for(int i=0;i<(int)hres.mNumFaces;++i) @@ -647,7 +647,7 @@ btSoftBody* btSoftBodyHelpers::CreateFromConvexHull(btSoftBodyWorldInfo& worldI if(idx[2]<idx[0]) psb->appendLink( idx[2],idx[0]); psb->appendFace(idx[0],idx[1],idx[2]); } - //hlib.ReleaseResult(hres); + hlib.ReleaseResult(hres); psb->randomizeConstraints(); return(psb); } |