Skip to content
Snippets Groups Projects
Verified Commit 80c4389d authored by Justin Carpentier's avatar Justin Carpentier Committed by Justin Carpentier
Browse files

[Model/Geometry] Small indent cleaning

parent 284743ef
No related branches found
No related tags found
No related merge requests found
......@@ -31,7 +31,6 @@
#include <utility>
#include <assert.h>
namespace se3
{
......@@ -58,9 +57,9 @@ namespace se3
CollisionPairVector collisionPairs;
GeometryModel()
: ngeoms(0)
, geometryObjects()
, collisionPairs()
: ngeoms(0)
, geometryObjects()
, collisionPairs()
{
const std::size_t num_max_collision_pairs = (ngeoms * (ngeoms-1))/2;
collisionPairs.reserve(num_max_collision_pairs);
......@@ -281,7 +280,7 @@ namespace se3
/// manner.
/// \param[in] pairId the index of the pair in GeomModel::collisionPairs vector.
/// \param[in] flag value of the activation boolean (true by default).
void activateCollisionPair(const PairIndex pairId,const bool flag=true);
void activateCollisionPair(const PairIndex pairId, const bool flag=true);
/// Deactivate a collision pair.
///
......
......@@ -28,23 +28,23 @@
namespace se3
{
inline GeometryData::GeometryData(const GeometryModel & modelGeom)
: oMg(modelGeom.ngeoms)
: oMg(modelGeom.ngeoms)
#ifdef WITH_HPP_FCL
, activeCollisionPairs(modelGeom.collisionPairs.size(), true)
, distanceRequest (true, 0, 0, fcl::GST_INDEP)
, distanceResults(modelGeom.collisionPairs.size())
, collisionRequest (1, false, false, 1, false, true, fcl::GST_INDEP)
, collisionResults(modelGeom.collisionPairs.size())
, radius()
, collisionPairIndex(0)
, innerObjects()
, outerObjects()
, activeCollisionPairs(modelGeom.collisionPairs.size(), true)
, distanceRequest (true, 0, 0, fcl::GST_INDEP)
, distanceResults(modelGeom.collisionPairs.size())
, collisionRequest (1, false, false, 1, false, true, fcl::GST_INDEP)
, collisionResults(modelGeom.collisionPairs.size())
, radius()
, collisionPairIndex(0)
, innerObjects()
, outerObjects()
{
collisionObjects.reserve(modelGeom.geometryObjects.size());
BOOST_FOREACH( const GeometryObject & geom, modelGeom.geometryObjects)
{ collisionObjects.push_back
(fcl::CollisionObject(geom.fcl)); }
{ collisionObjects.push_back
(fcl::CollisionObject(geom.fcl)); }
fillInnerOuterObjectMaps(modelGeom);
}
#else
......
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