Skip to content

Allow model frames (__model__) to be used as joint parent or child#833

Merged
azeey merged 1 commit intogazebosim:sdf11from
azeey:model_in_joint
Jan 27, 2022
Merged

Allow model frames (__model__) to be used as joint parent or child#833
azeey merged 1 commit intogazebosim:sdf11from
azeey:model_in_joint

Conversation

@azeey
Copy link
Copy Markdown
Collaborator

@azeey azeey commented Jan 27, 2022

🦟 Bug fix

Summary

The spec (http://sdformat.org/tutorials?tut=composition_proposal&cat=pose_semantics_docs&#1-3-3-model-frame-references) says "For a model named {name}, model frames can be referenced by their name. {name}::__model__ is also valid, but {name} is preferred instead." libsdformat has supported using a model's {name} in //joint/parent and //joint/child for a while, but it currently does not support {name}::__model__. This PR rectifies that and also adds support for using just __model__ since that is a valid frame inside a model.

Came up in PR review for #768: comment

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 and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey azeey self-assigned this Jan 27, 2022
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Jan 27, 2022
@scpeters
Copy link
Copy Markdown
Member

Ubuntu cmake warning:

CMake Warning:
  Manually-specified variables were not used by the project:

    SKIP_usd

@scpeters
Copy link
Copy Markdown
Member

Ubuntu cmake warning:

CMake Warning:
  Manually-specified variables were not used by the project:

    SKIP_usd

related to gazebo-tooling/release-tools#625

@scpeters
Copy link
Copy Markdown
Member

Ubuntu cmake warning:

related to ignition-tooling/release-tools#625

fix in gazebo-tooling/release-tools#632

@azeey azeey merged commit 61412e6 into gazebosim:sdf11 Jan 27, 2022
@azeey azeey deleted the model_in_joint branch January 27, 2022 18:03
azeey pushed a commit that referenced this pull request Jan 28, 2022
…835)

 #833 allowed using __model__ in //joint/parent or //joint/child. When merge-including models that include such cases, the __model__ has to be changed to the proxy frame.

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@osrf-triage
Copy link
Copy Markdown

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-03-25-fortress-edifice-citadel/1343/1

@osrf-triage
Copy link
Copy Markdown

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-04-13-fortress-edifice/1367/1

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.

4 participants