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

fix wrong enum type

Browse Source
This commit is contained in:
Erwin Coumans
2018-01-15 15:13:11 -08:00
parent 18c83592f3
commit af43e6465d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/multibody.bullet
View File

Binary file not shown.

4
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -8217,7 +8217,7 @@ int PhysicsServerCommandProcessor::extractCollisionShapes(const btCollisionShape
case CONVEX_HULL_SHAPE_PROXYTYPE: case CONVEX_HULL_SHAPE_PROXYTYPE:
{ {
UrdfCollision* urdfCol = m_data->m_bulletCollisionShape2UrdfCollision.find(colShape); UrdfCollision* urdfCol = m_data->m_bulletCollisionShape2UrdfCollision.find(colShape);
if (urdfCol && (urdfCol->m_geometry.m_type == GEOM_MESH)) if (urdfCol && (urdfCol->m_geometry.m_type == URDF_GEOM_MESH))
{ {
collisionShapeBuffer[0].m_collisionGeometryType = GEOM_MESH; collisionShapeBuffer[0].m_collisionGeometryType = GEOM_MESH;
collisionShapeBuffer[0].m_dimensions[0] = urdfCol->m_geometry.m_meshScale[0]; collisionShapeBuffer[0].m_dimensions[0] = urdfCol->m_geometry.m_meshScale[0];
@@ -8283,7 +8283,7 @@ int PhysicsServerCommandProcessor::extractCollisionShapes(const btCollisionShape
{ {
//it could be a compound mesh from a wavefront OBJ, check it //it could be a compound mesh from a wavefront OBJ, check it
UrdfCollision* urdfCol = m_data->m_bulletCollisionShape2UrdfCollision.find(colShape); UrdfCollision* urdfCol = m_data->m_bulletCollisionShape2UrdfCollision.find(colShape);
if (urdfCol && (urdfCol->m_geometry.m_type == GEOM_MESH)) if (urdfCol && (urdfCol->m_geometry.m_type == URDF_GEOM_MESH))
{ {
collisionShapeBuffer[0].m_collisionGeometryType = GEOM_MESH; collisionShapeBuffer[0].m_collisionGeometryType = GEOM_MESH;
collisionShapeBuffer[0].m_dimensions[0] = urdfCol->m_geometry.m_meshScale[0]; collisionShapeBuffer[0].m_dimensions[0] = urdfCol->m_geometry.m_meshScale[0];