Skip to content
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

[dartsim] Fix collision detection issue when using joints across nested models #268

Merged
merged 2 commits into from
Jun 24, 2021

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Jun 21, 2021

🦟 Bug fix

Fixes #264

Summary

When a joint is created between BodyNodes in different skeletons, the child BodyNode is moved to the skeleton of the parent BodyNode. When this happens, the BodyNode version of the child needs to be incremented. This is actually fixed by dartsim/dart#1445, but we don't have that merged into our fork. So in the meantime, we call incrementVersion after moveTo is called similar to #31.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge

Copy link
Contributor

@adlarkin adlarkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good to me, but there seem to be a few warnings in CI. I believe they're unrelated to this PR, but would they be worth fixing here? Here are the warnings:

Since these warnings are not related to this PR, I am also open to fixing these in a separate PR to keep file history clean.


Also, do we know when our DART fork will be updated to get this fix?

@azeey
Copy link
Contributor Author

azeey commented Jun 24, 2021

Changes look good to me, but there seem to be a few warnings in CI. I believe they're unrelated to this PR, but would they be worth fixing here?

I believe these will be fixed once #271 is merged.

Also, do we know when our DART fork will be updated to get this fix?

I'll cherry-pick that change to our fork in the next few days.

@codecov
Copy link

codecov bot commented Jun 24, 2021

Codecov Report

Merging #268 (472ba25) into ign-physics4 (a1a8f8b) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##           ign-physics4     #268   +/-   ##
=============================================
  Coverage         74.86%   74.86%           
=============================================
  Files               118      118           
  Lines              5227     5228    +1     
=============================================
+ Hits               3913     3914    +1     
  Misses             1314     1314           
Impacted Files Coverage Δ
dartsim/src/SDFFeatures.cc 67.21% <100.00%> (+0.06%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c6cdea6...472ba25. Read the comment docs.

@azeey azeey merged commit 0860af0 into gazebosim:ign-physics4 Jun 24, 2021
@azeey azeey deleted the fix_joint_across_models branch June 24, 2021 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Collisions are ignored for nested models connected to parent models with fixed joint
3 participants