Skip to content
Snippets Groups Projects
Commit 85b4f26e authored by Florent Lamiraux's avatar Florent Lamiraux Committed by Florent Lamiraux florent@laas.fr
Browse files

Minor fixes: take into account @jmirabel comments.

parent b7de3e52
No related branches found
No related tags found
No related merge requests found
...@@ -8,5 +8,3 @@ ALIASES += Link{1}="\ref \1" ...@@ -8,5 +8,3 @@ ALIASES += Link{1}="\ref \1"
ALIASES += Link{2}="\ref \1 \"\2\"" ALIASES += Link{2}="\ref \1 \"\2\""
ALIASES += LHPP{2}="\Link{hpp::\1::\2,\2}" ALIASES += LHPP{2}="\Link{hpp::\1::\2,\2}"
ALIASES += LPinocchio{1}="\LHPP{pinocchio,\1}" ALIASES += LPinocchio{1}="\LHPP{pinocchio,\1}"
EXTRA_PACKAGES = {amsmath}
...@@ -250,10 +250,7 @@ namespace hpp { ...@@ -250,10 +250,7 @@ namespace hpp {
if (!robot_->jointAndShapes.has (*it1)) if (!robot_->jointAndShapes.has (*it1))
throw std::runtime_error ("First list of triangles not found."); throw std::runtime_error ("First list of triangles not found.");
l = robot_->jointAndShapes.get (*it1); l = robot_->jointAndShapes.get (*it1);
for (JointAndShapes_t::const_iterator it(l.begin()); it!=l.end();++it) objectSurfaces.insert(objectSurfaces.end(), l.begin(), l.end());
{
objectSurfaces.push_back(*it);
}
} }
for (StringList_t::const_iterator it2 = surface2.begin (); for (StringList_t::const_iterator it2 = surface2.begin ();
...@@ -265,10 +262,7 @@ namespace hpp { ...@@ -265,10 +262,7 @@ namespace hpp {
else if (jointAndShapes.has (*it2)) else if (jointAndShapes.has (*it2))
l = jointAndShapes.get (*it2); l = jointAndShapes.get (*it2);
else throw std::runtime_error ("Second list of triangles not found."); else throw std::runtime_error ("Second list of triangles not found.");
for (JointAndShapes_t::const_iterator it(l.begin()); it!=l.end();++it) floorSurfaces.insert(floorSurfaces.end(), l.begin(), l.end());
{
floorSurfaces.push_back(*it);
}
} }
typedef hpp::constraints::explicit_::ConvexShapeContact Constraint_t; typedef hpp::constraints::explicit_::ConvexShapeContact Constraint_t;
...@@ -311,10 +305,7 @@ namespace hpp { ...@@ -311,10 +305,7 @@ namespace hpp {
if (!robot_->jointAndShapes.has (*it1)) if (!robot_->jointAndShapes.has (*it1))
throw std::runtime_error ("First list of triangles not found."); throw std::runtime_error ("First list of triangles not found.");
l = robot_->jointAndShapes.get (*it1); l = robot_->jointAndShapes.get (*it1);
for (JointAndShapes_t::const_iterator it(l.begin()); it!=l.end();++it) objectSurfaces.insert(objectSurfaces.end(), l.begin(), l.end());
{
objectSurfaces.push_back(*it);
}
} }
for (StringList_t::const_iterator it2 = surface2.begin (); for (StringList_t::const_iterator it2 = surface2.begin ();
...@@ -326,10 +317,7 @@ namespace hpp { ...@@ -326,10 +317,7 @@ namespace hpp {
else if (jointAndShapes.has (*it2)) else if (jointAndShapes.has (*it2))
l = jointAndShapes.get (*it2); l = jointAndShapes.get (*it2);
else throw std::runtime_error ("Second list of triangles not found."); else throw std::runtime_error ("Second list of triangles not found.");
for (JointAndShapes_t::const_iterator it(l.begin()); it!=l.end();++it) floorSurfaces.insert(floorSurfaces.end(), l.begin(), l.end());
{
floorSurfaces.push_back(*it);
}
} }
hpp::constraints::ConvexShapeContactPtr_t cvxShape hpp::constraints::ConvexShapeContactPtr_t cvxShape
......
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