Skip to content

Commit

Permalink
Merge pull request bulletphysics#2781 from erwincoumans/master
Browse files Browse the repository at this point in the history
bump up pybullet version to 2.7.5
  • Loading branch information
erwincoumans authored May 5, 2020
2 parents ca50714 + d479ca7 commit bedf63c
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 4 deletions.
2 changes: 1 addition & 1 deletion examples/SharedMemory/PhysicsDirect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ void PhysicsDirect::postProcessStatus(const struct SharedMemoryStatus& serverCmd

case CMD_REQUEST_OPENGL_VISUALIZER_CAMERA_FAILED:
{
b3Warning("requestOpenGLVisualizeCamera failed");
//b3Warning("requestOpenGLVisualizeCamera failed");
break;
}
case CMD_REMOVE_USER_CONSTRAINT_FAILED:
Expand Down
3 changes: 3 additions & 0 deletions examples/SharedMemory/PhysicsServerCommandProcessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12709,6 +12709,8 @@ bool PhysicsServerCommandProcessor::processUpdateVisualShapeCommand(const struct
m_data->m_guiHelper->changeSpecularColor(graphicsIndex, clientCmd.m_updateVisualShapeDataArguments.m_specularColor);
}
}
#ifndef SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD

else if (bodyHandle->m_softBody)
{
if (clientCmd.m_updateFlags & CMD_UPDATE_VISUAL_SHAPE_RGBA_COLOR)
Expand All @@ -12720,6 +12722,7 @@ bool PhysicsServerCommandProcessor::processUpdateVisualShapeCommand(const struct
}
}
}
#endif
}
}
}
Expand Down
24 changes: 22 additions & 2 deletions examples/pybullet/pybullet.c
Original file line number Diff line number Diff line change
Expand Up @@ -6980,7 +6980,27 @@ static PyObject* pybullet_getDebugVisualizerCamera(PyObject* self, PyObject* arg
int hasCamInfo;
b3SharedMemoryStatusHandle statusHandle;
struct b3OpenGLVisualizerCameraInfo camera;
PyObject* pyCameraList = 0;
int i;
camera.m_width=0;
camera.m_height=0;
camera.m_dist=0;
camera.m_yaw=0;
camera.m_pitch=0;

for (i=0;i<16;i++)
{
camera.m_viewMatrix[i]=0;
camera.m_projectionMatrix[i]=0;
}
for (i=0;i<3;i++)
{
camera.m_camUp[i]=0;
camera.m_camForward[i]=0;
camera.m_horizontal[i]=0;
camera.m_vertical[i]=0;
camera.m_target[i]=0;
}
PyObject* pyCameraList = 0;

sm = getPhysicsClient(physicsClientId);
if (sm == 0)
Expand All @@ -6993,7 +7013,7 @@ static PyObject* pybullet_getDebugVisualizerCamera(PyObject* self, PyObject* arg
statusHandle = b3SubmitClientCommandAndWaitStatus(sm, commandHandle);

hasCamInfo = b3GetStatusOpenGLVisualizerCamera(statusHandle, &camera);
if (hasCamInfo)
if (1)
{
PyObject* item = 0;
pyCameraList = PyTuple_New(12);
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ def _single_compile(obj):

setup(
name='pybullet',
version='2.7.4',
version='2.7.6',
description=
'Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning',
long_description=
Expand Down

0 comments on commit bedf63c

Please sign in to comment.