Verified Commit 5563964a authored by Justin Carpentier's avatar Justin Carpentier
Browse files

core: formatting of disableCollision

parent e70b703a
......@@ -160,7 +160,7 @@ struct GeometryObject
std::string meshTexturePath;
/// \brief It true, no collision or distance check will be done between the Geometry and any other geometry
bool disable_collision;
bool disableCollision;
PINOCCHIO_COMPILER_DIAGNOSTIC_PUSH
PINOCCHIO_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
......@@ -199,7 +199,7 @@ PINOCCHIO_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
, overrideMaterial(overrideMaterial)
, meshColor(meshColor)
, meshTexturePath(meshTexturePath)
, disable_collision(false)
, disableCollision(false)
{}
PINOCCHIO_COMPILER_DIAGNOSTIC_POP
......@@ -239,16 +239,17 @@ PINOCCHIO_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
, overrideMaterial(overrideMaterial)
, meshColor(meshColor)
, meshTexturePath(meshTexturePath)
, disable_collision(false)
, disableCollision(false)
{}
PINOCCHIO_COMPILER_DIAGNOSTIC_POP
PINOCCHIO_COMPILER_DIAGNOSTIC_PUSH
PINOCCHIO_COMPILER_DIAGNOSTIC_IGNORED_DEPRECECATED_DECLARATIONS
GeometryObject(const GeometryObject & other)
GeometryObject(const GeometryObject & other, bool deep_copy = false)
: fcl(geometry)
{
*this = other;
}
PINOCCHIO_COMPILER_DIAGNOSTIC_POP
......@@ -264,7 +265,7 @@ PINOCCHIO_COMPILER_DIAGNOSTIC_POP
overrideMaterial = other.overrideMaterial;
meshColor = other.meshColor;
meshTexturePath = other.meshTexturePath;
disable_collision = other.disable_collision;
disableCollision = other.disableCollision;
return *this;
}
......
......@@ -61,7 +61,7 @@ namespace pinocchio
&& lhs.placement == rhs.placement
&& lhs.meshPath == rhs.meshPath
&& lhs.meshScale == rhs.meshScale
&& lhs.disable_collision == rhs.disable_collision
&& lhs.disableCollision == rhs.disableCollision
);
}
......@@ -78,7 +78,7 @@ namespace pinocchio
<< "Position in parent frame: \t \n" << geom_object.placement << "\n"
<< "Absolute path to mesh file: \t \n" << geom_object.meshPath << "\n"
<< "Scale for transformation of the mesh: \t \n" << geom_object.meshScale.transpose() << "\n"
<< "Disable collision: \t \n" << geom_object.disable_collision << "\n"
<< "Disable collision: \t \n" << geom_object.disableCollision << "\n"
<< std::endl;
return os;
}
......
......@@ -41,7 +41,7 @@ namespace pinocchio
// Iterate over collision pairs
BOOST_FOREACH(const ptree::value_type & v, pt.get_child("robot"))
{
if (v.first == "disable_collisions")
if (v.first == "disableCollisions")
{
const std::string link1 = v.second.get<std::string>("<xmlattr>.link1");
const std::string link2 = v.second.get<std::string>("<xmlattr>.link2");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment