diff --git a/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp b/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp index 9ee66c85f..7210b3219 100644 --- a/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp +++ b/examples/Importers/ImportURDFDemo/URDF2Bullet.cpp @@ -393,7 +393,7 @@ void ConvertURDF2BulletInternal( btGeneric6DofSpring2Constraint* dof6 = 0; //backward compatibility - if (flags & URDF_ORDER_TYPED_CONSTRAINT ) + if (flags & CUF_RESERVED ) { dof6 = creation.createFixedJoint(urdfLinkIndex,*parentRigidBody, *linkRigidBody, offsetInA, offsetInB); } else @@ -427,7 +427,7 @@ void ConvertURDF2BulletInternal( btGeneric6DofSpring2Constraint* dof6 = 0; //backwards compatibility - if (flags & URDF_ORDER_TYPED_CONSTRAINT ) + if (flags & CUF_RESERVED ) { dof6 = creation.createRevoluteJoint(urdfLinkIndex,*parentRigidBody, *linkRigidBody, offsetInA, offsetInB,jointAxisInJointSpace,jointLowerLimit, jointUpperLimit); } else diff --git a/examples/Importers/ImportURDFDemo/URDF2Bullet.h b/examples/Importers/ImportURDFDemo/URDF2Bullet.h index ccc63c4d9..68acf497d 100644 --- a/examples/Importers/ImportURDFDemo/URDF2Bullet.h +++ b/examples/Importers/ImportURDFDemo/URDF2Bullet.h @@ -22,6 +22,7 @@ enum ConvertURDFFlags { CUF_USE_SELF_COLLISION=8, CUF_USE_SELF_COLLISION_EXCLUDE_PARENT=16, CUF_USE_SELF_COLLISION_EXCLUDE_ALL_PARENTS=32, + CUF_RESERVED=64, }; void ConvertURDF2Bullet(const URDFImporterInterface& u2b, diff --git a/examples/Importers/ImportURDFDemo/URDFJointTypes.h b/examples/Importers/ImportURDFDemo/URDFJointTypes.h index 5f470449d..2edad8617 100644 --- a/examples/Importers/ImportURDFDemo/URDFJointTypes.h +++ b/examples/Importers/ImportURDFDemo/URDFJointTypes.h @@ -61,7 +61,6 @@ enum UrdfCollisionFlags URDF_FORCE_CONCAVE_TRIMESH=1, URDF_HAS_COLLISION_GROUP=2, URDF_HAS_COLLISION_MASK=4, - URDF_ORDER_TYPED_CONSTRAINT=8, }; struct UrdfMaterialColor diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index a51202ee8..47d3b36b8 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -2416,7 +2416,8 @@ bool PhysicsServerCommandProcessor::processImportedObjects(const char* fileName, MyMultiBodyCreator creation(m_data->m_guiHelper); u2b.getRootTransformInWorld(rootTrans); - flags |= URDF_ORDER_TYPED_CONSTRAINT; + //CUF_RESERVED is a temporary flag, for backward compatibility purposes + flags |= CUF_RESERVED; ConvertURDF2Bullet(u2b,creation, rootTrans,m_data->m_dynamicsWorld,useMultiBody,u2b.getPathPrefix(),flags); diff --git a/examples/SharedMemory/SharedMemoryPublic.h b/examples/SharedMemory/SharedMemoryPublic.h index 13b8f18a5..cfa605bc4 100644 --- a/examples/SharedMemory/SharedMemoryPublic.h +++ b/examples/SharedMemory/SharedMemoryPublic.h @@ -589,6 +589,8 @@ enum eURDF_Flags URDF_USE_SELF_COLLISION=8,//see CUF_USE_SELF_COLLISION URDF_USE_SELF_COLLISION_EXCLUDE_PARENT=16, URDF_USE_SELF_COLLISION_EXCLUDE_ALL_PARENTS=32, + URDF_RESERVED=64, + }; enum eUrdfGeomTypes //sync with UrdfParser UrdfGeomTypes