-
Notifications
You must be signed in to change notification settings - Fork 355
Fix CheckLinkSelfCollision and CheckEndEffectorCollision #1443
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
snozawa
wants to merge
23
commits into
production
Choose a base branch
from
fixGrabbedSelfCollisionCheckInOtherAPIs
base: production
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+282
−218
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ed variables. 2) remove unused kinbodysaver from the first overload function. 3) remove linksaver, since it will not be necessary when _CheckGrabbedBodiesSelfCollision will be used.
…fCollsionCheck overload. In addition, keep the plink transform for grabbed bodies checking.
…ion checking context. So far, we supply vindependentlinks. Although we can do that by both inclusive links and exclusive links, introduce inclusive links here because we can just use vindependent links in CheckEndEffectorSelfCollisionCheck function
…ing ilinkindex. - Issue - In the previous implementation, Manipulator::CheckEndEffectorCollision with bIgnoreManipulatorLinks does not properly consider the conditions which CheckStandaloneSelfCollision covers. - For example, isSelfCollisionIgnored or adjacent links is not considered at all. - In addition, the code itself looks duplicated. - Resolution. - CheckLinkSelfCollision with specifying ilinkindex supports vector of included links. if empty, consider all possible pairs. if not empty, check links only in included links. - In the collisionchecker.h, there are both excluded links and included links. In this particular case, Manipulator::CheckEndEffectorCollision computes included links as vindependentinks and using it is convenient.
cd89346 to
3850b85
Compare
…ollisionCheckInOtherAPIs
…nts of vector is already different according to bIgnoreManipulatorLinks
…ollisionCheckInOtherAPIs
Owner
|
@snozawa is this still active? |
Collaborator
Author
thanks for checking! initially this PR was ready, but i'll double-check if this works as well in the latest relevant repositories. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
KinBody::CheckLinkSelfCollisionandManipulator::CheckEndEffectorCollision, which are mostly used from IK related code path.Bug fix 1
KinBody::CheckLinkSelfCollisionfunctions have a code trying to handle grabbed bodies.CheckCollision(KinBody, KinBody), and it ignores the collision checking between two bodies attached each other.openrave/src/libopenrave/kinbodycollision.cpp
Line 464 in d1b75e6
CheckSelfCollision.CheckSelfCollisionandCheckLinkSelfCollision.CheckLinkSelfCollisionuse cases:openrave/src/libopenrave/kinbodycollision.cpp
Line 454 in d1b75e6
openrave/src/libopenrave/kinbodycollision.cpp
Line 463 in d1b75e6
Bug fix 2
does not check the self collision with grabbed bodies at all, ifbIgnoreManipulatorLinks=trueis specified :openrave/src/libopenrave/robotmanipulator.cpp
Lines 1147 to 1155 in d1b75e6
CheckLinkSelfCollisionas other code path.Bug fix 3
Manipulator::CheckEndEffectorSelfCollisionis implemented hand-made link-link collision checking ifbIgnoreManipulatorLinks=trueis specified :openrave/src/libopenrave/robotmanipulator.cpp
Lines 1147 to 1155 in d1b75e6
isSelfCollisionIgnoredand adjacent links.vIncludedLinksarguments to one of theCollisionCheckerBase::CheckStandaloneSelfCollisionoverload, which takesplinkfrom the argument. Accordingly, add the same argument toKinBody::CheckLinkSelfCollisionas well.CheckEndEffectorSelfCollisionside. But, it's hard to maintain. So, better to support included links inKinBody::CheckLinkSelfCollision.CollisionCheckerBase. In these two, I used included links in this PR, since the included link in this situation can be easily computed fromGetIndependentLinksof manipulator.Misc improvements
CheckEndEffectorSelfCollisionandCheckLinkSelfCollisionhave duplicated codes. Reduce it by introducing common functions.