Skip to content

Extract EntityStorage to a shared location so it can be used by other physics engines (backport #894)#897

Merged
azeey merged 2 commits into
gz-physics9from
mergify/bp/gz-physics9/pr-894
May 1, 2026
Merged

Extract EntityStorage to a shared location so it can be used by other physics engines (backport #894)#897
azeey merged 2 commits into
gz-physics9from
mergify/bp/gz-physics9/pr-894

Conversation

@mergify

@mergify mergify Bot commented Mar 10, 2026

Copy link
Copy Markdown
Contributor

Summary

Split out of #811

The EntityStorage class is useful for tracking mappings between gz-physics entities and the underlying physics engine. This PR moves it out of the dartsim component and puts it in the include/gz/physics/details directory so that it can be used by all physics engine plugins. I put it in details since it is meant to be used internally by the engine plugins.

This also fixes a couple of SDF warnings.

Checklist

  • Signed all commits for DCO
  • Added a screen capture or video to the PR description that demonstrates the feature
  • 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)
  • Updated Bazel files (if adding new files). Created an issue otherwise.
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers
  • Was GenAI used to generate this PR? If so, make sure to add "Generated-by" to your commits. (See this policy for more info.)

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by and Generated-by messages.

Backports: If this is a backport, please use Rebase and Merge instead.


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

@mergify
mergify Bot requested review from azeey and scpeters as code owners March 10, 2026 15:58
@mergify mergify Bot added the conflicts label Mar 10, 2026
@mergify

mergify Bot commented Mar 10, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of a9ea56c has failed:

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

You are currently cherry-picking commit a9ea56c.
  (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/SDFFeatures_TEST.cc
	new file:   include/gz/physics/detail/EntityStorage.hh
	modified:   test/common_test/simulation_features.cc
	modified:   test/common_test/worlds/test.world

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

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

… physics engines (#894)

Signed-off-by: Addisu Z. Taddese <addisuzt@intrinsic.ai>
@azeey
azeey force-pushed the mergify/bp/gz-physics9/pr-894 branch from 61f4fc9 to 4f23a0d Compare April 14, 2026 22:15
@azeey azeey removed the conflicts label Apr 14, 2026
@azeey
azeey requested a review from iche033 April 14, 2026 22:21
@azeey

azeey commented May 1, 2026

Copy link
Copy Markdown
Contributor

Can I get a review on this since I fixed conflicts?

@github-project-automation github-project-automation Bot moved this from Inbox to In review in Core development May 1, 2026
@azeey
azeey enabled auto-merge (rebase) May 1, 2026 17:12
@azeey
azeey merged commit 2c6e327 into gz-physics9 May 1, 2026
13 checks passed
@azeey
azeey deleted the mergify/bp/gz-physics9/pr-894 branch May 1, 2026 18:22
@github-project-automation github-project-automation Bot moved this from In review to Done in Core development May 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🪵 jetty Gazebo Jetty

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants