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

Support setting max contacts in dart's bullet collision detector #593

Merged
merged 6 commits into from
Dec 20, 2024

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Jan 30, 2024

🎉 New feature

depends on #584

Summary

This PR extends dart's bullet collision detector to support the max contact collision pair feature.

This is a follow-up to #582 which added this feature for dart's ode collision detector.

Changes:

  • Refactored existing implementation to derive off of a base GzCollisionDetector a class for limiting max contact points in dartsim: 4da0d6f
  • Added a new GzBulletCollisionDetector class for extending the max contact feature to dart's bullet collision detector: 4da0d6f

Test it

Updated test in simulation_features.c to test the max contact feature with dart's bullet collision detector

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • 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 and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Copy link

codecov bot commented Jan 30, 2024

Codecov Report

Attention: Patch coverage is 85.96491% with 8 lines in your changes missing coverage. Please review.

Project coverage is 78.54%. Comparing base (4fa59f2) to head (3ef0790).
Report is 27 commits behind head on gz-physics6.

Current head 3ef0790 differs from pull request most recent head 48be582

Please upload reports for the commit 48be582 to get more accurate results.

Files Patch % Lines
dartsim/src/GzCollisionDetector.cc 87.23% 6 Missing ⚠️
dartsim/src/WorldFeatures.cc 80.00% 2 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##           gz-physics6     #593      +/-   ##
===============================================
- Coverage        78.59%   78.54%   -0.06%     
===============================================
  Files              140      140              
  Lines             7654     7705      +51     
===============================================
+ Hits              6016     6052      +36     
- Misses            1638     1653      +15     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

dartsim/src/GzCollisionDetector.hh Show resolved Hide resolved
@iche033 iche033 requested a review from ahcorde January 30, 2024 18:43
@azeey
Copy link
Contributor

azeey commented Jun 10, 2024

@azeey to review

Base automatically changed from max_contacts_ode_2 to gz-physics6 June 10, 2024 20:53
@iche033 iche033 added the 🌱 garden Ignition Garden label Jun 18, 2024
@azeey azeey added the beta Targeting beta release of upcoming collection label Jul 29, 2024
@azeey azeey removed the beta Targeting beta release of upcoming collection label Sep 26, 2024
Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

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

Looks great to me! Sorry for the long delay in reviewing this. One unfortunate consequence is that Garden is now EOL, so we shouldn't merge into this branch. Do you mind retargetting this to gz-physics8(Ionic)?

dartsim/src/WorldFeatures.cc Outdated Show resolved Hide resolved
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@iche033 iche033 force-pushed the max_contacts_dart_bullet branch from 48be582 to 572540b Compare December 18, 2024 18:21
@iche033 iche033 changed the base branch from gz-physics6 to gz-physics8 December 18, 2024 18:22
@iche033
Copy link
Contributor Author

iche033 commented Dec 18, 2024

Looks great to me! Sorry for the long delay in reviewing this. One unfortunate consequence is that Garden is now EOL, so we shouldn't merge into this branch. Do you mind retargetting this to gz-physics8(Ionic)?

retargeted to gz-physics8

@iche033 iche033 added 🏛️ ionic Gazebo Ionic and removed 🌱 garden Ignition Garden labels Dec 20, 2024
@iche033 iche033 dismissed ahcorde’s stale review December 20, 2024 17:50

comment addressed

@iche033 iche033 merged commit a4eee2f into gz-physics8 Dec 20, 2024
10 checks passed
@iche033 iche033 deleted the max_contacts_dart_bullet branch December 20, 2024 17:51
@iche033
Copy link
Contributor Author

iche033 commented Dec 20, 2024

@Mergifyio backport gz-physics7

Copy link

mergify bot commented Dec 20, 2024

backport gz-physics7

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Dec 20, 2024
Signed-off-by: Ian Chen <[email protected]>
(cherry picked from commit a4eee2f)

# Conflicts:
#	dartsim/src/GzCollisionDetector.cc
iche033 added a commit that referenced this pull request Dec 21, 2024
Signed-off-by: Ian Chen <[email protected]>
(cherry picked from commit a4eee2f)

# Conflicts:
#	dartsim/src/GzCollisionDetector.cc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏛️ ionic Gazebo Ionic
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants