Skip to content
Snippets Groups Projects
Commit 70cf3c7e authored by Nicolas Mansard's avatar Nicolas Mansard Committed by Nicolas Mansard
Browse files

[c++][Minor] Geom: moved constructor implementation from hpp to hxx.

parent f187c844
No related branches found
No related tags found
No related merge requests found
......@@ -244,35 +244,11 @@ namespace se3
/// 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;
GeometryData(const GeometryModel & modelGeom)
: model_geom(modelGeom)
, oMg(model_geom.ngeoms)
, activeCollisionPairs(modelGeom.collisionPairs.size(), true)
, distanceRequest (true, 0, 0, fcl::GST_INDEP)
, distance_results(modelGeom.collisionPairs.size())
, collisionRequest (1, false, false, 1, false, true, fcl::GST_INDEP)
, collision_results(modelGeom.collisionPairs.size())
, radius()
, collisionPairIndex(-1)
, innerObjects()
, outerObjects()
{
collisionObjects.reserve(modelGeom.geometryObjects.size());
BOOST_FOREACH( const GeometryObject & geom, modelGeom.geometryObjects)
{ collisionObjects.push_back
(fcl::CollisionObject(geom.collision_geometry)); }
fillInnerOuterObjectMaps();
}
#else
GeometryData(const GeometryModel & modelGeom)
: model_geom(modelGeom)
, oMg(model_geom.ngeoms)
{}
#endif // WITH_HPP_FCL
GeometryData(const GeometryModel & modelGeom);
~GeometryData() {};
#ifdef WITH_HPP_FCL
/// Fill both innerObjects and outerObjects maps, from vectors collisionObjects and
......
......@@ -31,6 +31,30 @@
namespace se3
{
inline GeometryData::GeometryData(const GeometryModel & modelGeom)
: model_geom(modelGeom)
, oMg(model_geom.ngeoms)
#ifdef WITH_HPP_FCL
, activeCollisionPairs(modelGeom.collisionPairs.size(), true)
, distanceRequest (true, 0, 0, fcl::GST_INDEP)
, distance_results(modelGeom.collisionPairs.size())
, collisionRequest (1, false, false, 1, false, true, fcl::GST_INDEP)
, collision_results(modelGeom.collisionPairs.size())
, radius()
, collisionPairIndex(-1)
, innerObjects()
, outerObjects()
{
collisionObjects.reserve(modelGeom.geometryObjects.size());
BOOST_FOREACH( const GeometryObject & geom, modelGeom.geometryObjects)
{ collisionObjects.push_back
(fcl::CollisionObject(geom.collision_geometry)); }
fillInnerOuterObjectMaps();
}
#else
{}
#endif // WITH_HPP_FCL
inline GeomIndex GeometryModel::addGeometryObject(const GeometryObject& object)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment