Verified Commit 123c9bc0 authored by Justin Carpentier's avatar Justin Carpentier
Browse files

core/geometry: fix other guard issues

parent dbfb739d
......@@ -230,6 +230,7 @@ namespace pinocchio
/// the algo computeCollisions() sets it to the first colliding pair.
///
PairIndex collisionPairIndex;
#endif // PINOCCHIO_WITH_HPP_FCL
/// \brief Map over vector GeomModel::geometryObjects, indexed by joints.
///
......@@ -242,7 +243,6 @@ namespace pinocchio
/// Outer objects can be seen as geometry objects that may often be
/// obstacles to the Inner objects of given joint
std::map<JointIndex,GeomIndexList> outerObjects;
#endif // PINOCCHIO_WITH_HPP_FCL
GeometryData(const GeometryModel & geomModel);
~GeometryData() {};
......
......@@ -21,6 +21,7 @@ namespace pinocchio
, collisionResults(geom_model.collisionPairs.size())
, radius()
, collisionPairIndex(0)
#endif // PINOCCHIO_WITH_HPP_FCL
, innerObjects()
, outerObjects()
{
......@@ -31,10 +32,7 @@ namespace pinocchio
}
fillInnerOuterObjectMaps(geom_model);
}
#else
{}
#endif // PINOCCHIO_WITH_HPP_FCL
template<typename S2, int O2, template<typename,int> class JointCollectionTpl>
GeomIndex GeometryModel::addGeometryObject(const GeometryObject & object,
const ModelTpl<S2,O2,JointCollectionTpl> & model)
......
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