Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mods for compatibility with older compiler

Browse Source
This commit is contained in:
Xuchen Han
2019-08-16 14:03:14 -07:00
parent bf215a3ce1
commit 6d4e93d3bf
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BulletSoftBody/btSoftBodyHelpers.cpp
View File

@@ -746,9 +746,9 @@ btSoftBody* btSoftBodyHelpers::CreatePatch(btSoftBodyWorldInfo& worldInfo, const
{
const btScalar tx = ix / (btScalar)(rx - 1);
btScalar pert = perturbation * btScalar(rand())/RAND_MAX;
btVector4 temp1 = py1;
btVector3 temp1 = py1;
temp1.setY(py1.getY() + pert);
btVector4 temp = py0;
btVector3 temp = py0;
pert = perturbation * btScalar(rand())/RAND_MAX;
temp.setY(py0.getY() + pert);
x[IDX(ix, iy)] = lerp(temp, temp1, tx);
@@ -1239,7 +1239,7 @@ if(face&&face[0])
return (psb);
}
btSoftBody* btSoftBodyHelpers::CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo, const std::string& vtk_file)
btSoftBody* btSoftBodyHelpers::CreateFromVtkFile(btSoftBodyWorldInfo& worldInfo, const char* vtk_file)
{
std::ifstream fs;
fs.open(vtk_file);