Skip to content

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

Open
mergify[bot] wants to merge 1 commit intogz-physics7from
mergify/bp/gz-physics7/pr-894
Open

Extract EntityStorage to a shared location so it can be used by other physics engines (backport #894)#895
mergify[bot] wants to merge 1 commit intogz-physics7from
mergify/bp/gz-physics7/pr-894

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 10, 2026

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).

… physics engines (#894)

Signed-off-by: Addisu Z. Taddese <addisuzt@intrinsic.ai>
(cherry picked from commit a9ea56c)

# Conflicts:
#	dartsim/src/Base.hh
#	dartsim/src/SDFFeatures_TEST.cc
#	test/common_test/worlds/test.world
@mergify mergify bot requested review from azeey and scpeters as code owners March 10, 2026 15:57
@mergify mergify bot added the conflicts label Mar 10, 2026
@mergify
Copy link
Author

mergify bot commented Mar 10, 2026

Cherry-pick of a9ea56c has failed:

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

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:
	new file:   include/gz/physics/detail/EntityStorage.hh
	modified:   test/common_test/simulation_features.cc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   dartsim/src/Base.hh
	both modified:   dartsim/src/SDFFeatures_TEST.cc
	both modified:   test/common_test/worlds/test.world

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Inbox

Development

Successfully merging this pull request may close these issues.

1 participant