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 (backport #593) #709

Merged
merged 2 commits into from
Dec 21, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 20, 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.


This is an automatic backport of pull request #593 done by [Mergify](https://mergify.com).

Signed-off-by: Ian Chen <ichen@openrobotics.org>
(cherry picked from commit a4eee2f)

# Conflicts:
#	dartsim/src/GzCollisionDetector.cc
@mergify mergify bot added the conflicts label Dec 20, 2024
@mergify mergify bot requested a review from azeey as a code owner December 20, 2024 20:45
Copy link
Author

mergify bot commented Dec 20, 2024

Cherry-pick of a4eee2f has failed:

On branch mergify/bp/gz-physics7/pr-593
Your branch is up to date with 'origin/gz-physics7'.

You are currently cherry-picking commit a4eee2f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   dartsim/src/EntityManagementFeatures.cc
	renamed:    dartsim/src/GzOdeCollisionDetector.hh -> dartsim/src/GzCollisionDetector.hh
	deleted:    dartsim/src/GzOdeCollisionDetector.cc
	modified:   dartsim/src/WorldFeatures.cc
	modified:   test/common_test/simulation_features.cc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   dartsim/src/GzCollisionDetector.cc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from scpeters as a code owner December 20, 2024 20:45
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Dec 20, 2024
Signed-off-by: Ian Chen <ichen@openrobotics.org>
@iche033 iche033 removed the conflicts label Dec 20, 2024
@iche033 iche033 merged commit b7c1c9b into gz-physics7 Dec 21, 2024
9 checks passed
@iche033 iche033 deleted the mergify/bp/gz-physics7/pr-593 branch December 21, 2024 02:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant