minor fixes, bump up pybullet to 2.5.5

This commit is contained in:
Erwin Coumans
2019-08-14 21:30:10 -07:00
parent f09cefabe8
commit 648844e898
3 changed files with 26 additions and 22 deletions

View File

@@ -8054,17 +8054,20 @@ static PyObject* pybullet_createCollisionShape(PyObject* self, PyObject* args, P
}
if (shapeType == GEOM_HEIGHTFIELD && fileName==0 && heightfieldDataObj && numHeightfieldColumns>0 && numHeightfieldRows > 0)
{
PyObject* seqPoints=0;
int numHeightfieldPoints;
if (meshScaleObj)
{
pybullet_internalSetVectord(meshScaleObj, meshScale);
}
PyObject* seqPoints = PySequence_Fast(heightfieldDataObj, "expected a sequence");
int numHeightfieldPoints = PySequence_Size(heightfieldDataObj);
seqPoints = PySequence_Fast(heightfieldDataObj, "expected a sequence");
numHeightfieldPoints = PySequence_Size(heightfieldDataObj);
if (numHeightfieldPoints != numHeightfieldColumns*numHeightfieldRows)
{
PyErr_SetString(SpamError, "Size of heightfieldData doesn't match numHeightfieldColumns*numHeightfieldRows");
return NULL;
}
{
PyObject* item;
int i;
float* pointBuffer = (float*)malloc(numHeightfieldPoints*sizeof(float));
@@ -8090,6 +8093,7 @@ static PyObject* pybullet_createCollisionShape(PyObject* self, PyObject* args, P
if (seqPoints)
Py_DECREF(seqPoints);
}
}
if (shapeType == GEOM_MESH && fileName)
{
pybullet_internalSetVectord(meshScaleObj, meshScale);

View File

@@ -485,7 +485,7 @@ if 'BT_USE_EGL' in EGL_CXX_FLAGS:
setup(
name='pybullet',
version='2.5.4',
version='2.5.5',
description=
'Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning',
long_description=

View File

@@ -33,7 +33,7 @@ struct DeformableContactConstraint
append(rcontact);
}
DeformableContactConstraint(const btVector3 dir)
DeformableContactConstraint(const btVector3& dir)
{
m_contact.push_back(NULL);
m_direction.push_back(dir);