Skip to content

Commit

Permalink
Revert deprecation of ACM::setEntry(name, allowed)
Browse files Browse the repository at this point in the history
This reverts commit 73acbde.
Instead, just hint at setDefaultEntry().
  • Loading branch information
rhaschke committed Dec 28, 2021
1 parent d89af78 commit 03f6a9b
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,14 @@ class AllowedCollisionMatrix
void setEntry(const std::string& name1, const std::string& name2, const DecideContactFn& fn);

/** @brief Set the entries corresponding to a name.
* With each of the the known names in the collision matrix, form a pair using the name
* With each of the *known names* in the collision matrix, form a pair using the name
* specified as argument to this function and set the entry as indicated by \e allowed.
* As the set of known names might change in future, consider using setDefaultEntry() instead!
* @param name the object name
* @param allowed If false, indicates that collisions between two elements must be checked for and no collisions
* will be ignored (AllowedCollision::NEVER). If true, indicates that collisions between two elements are ok and an
* explicit collision computation is not necessary (AllowedCollision::ALWAYS).*/
[[deprecated]] void setEntry(const std::string& name, bool allowed);
void setEntry(const std::string& name, bool allowed);

/** @brief Set multiple entries. Pairs of names are formed using \e name and \e other_names
* @param name name of first element
Expand Down

0 comments on commit 03f6a9b

Please sign in to comment.