Skip to content

Commit

Permalink
Remove FCLModel::parent_link_names_
Browse files Browse the repository at this point in the history
Adjacent link collisions should be ignored in SRDF
  • Loading branch information
KolinGuo committed Apr 6, 2024
1 parent 068730f commit 6462462
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
1 change: 0 additions & 1 deletion include/mplib/collision_detection/fcl/fcl_model.h
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ class FCLModelTpl {

std::vector<fcl::FCLObject<S>> collision_objects_;
std::vector<std::string> collision_link_names_;
std::vector<std::string> parent_link_names_;
std::vector<std::pair<size_t, size_t>> collision_pairs_;

std::vector<std::string> user_link_names_;
Expand Down
9 changes: 1 addition & 8 deletions src/collision_detection/fcl/fcl_model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ std::unique_ptr<FCLModelTpl<S>> FCLModelTpl<S>::createFromURDFString(
for (const auto &collision_obj : collision_objs) {
fcl_model->collision_objects_.push_back(collision_obj);
fcl_model->collision_link_names_.push_back(link_name);
// fcl_model->parent_link_names_.push_back(parent_link_name); // FIXME: remove
fcl_model->collision_origin2link_poses_.push_back(collision_obj->getTransform());
}
// setLinkOrder with unique collision link names as user_link_names
Expand Down Expand Up @@ -88,13 +87,8 @@ void FCLModelTpl<S>::init(const urdf::ModelInterfaceSharedPtr &urdf_model,

for (size_t i = 0; i < collision_link_names_.size(); i++)
for (size_t j = 0; j < i; j++)
if (collision_link_names_[i] != collision_link_names_[j] &&
parent_link_names_[i] != collision_link_names_[j] &&
parent_link_names_[j] != collision_link_names_[i]) {
// We assume that the collisions between objects append to the same joint can be
// ignored.
if (collision_link_names_[i] != collision_link_names_[j])
collision_pairs_.push_back(std::make_pair(j, i));
}
}

template <typename S>
Expand Down Expand Up @@ -154,7 +148,6 @@ void FCLModelTpl<S>::dfsParseTree(const urdf::LinkConstSharedPtr &link,

collision_objects_.push_back(fcl_obj);
collision_link_names_.push_back(link->name);
parent_link_names_.push_back(parent_link_name);
}
}
for (const auto &child : link->child_links) dfsParseTree(child, link->name);
Expand Down

0 comments on commit 6462462

Please sign in to comment.