-
Notifications
You must be signed in to change notification settings - Fork 14
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
Merging for Composition: Proposed behavior #55
Merging for Composition: Proposed behavior #55
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 0 of 2 files reviewed, 1 unresolved discussion (waiting on @EricCousineau-TRI)
composition/merge_proposal.md, line 54 at r1 (raw file):
## Proposed changes TBD
Working: Will fill these out pending draft PR for implementation.
Signed-off-by: Eric Cousineau <[email protected]>
c9428ab
to
0d264d7
Compare
Signed-off-by: Steve Peters <[email protected]>
0a7888e
to
cc578e7
Compare
I've started on this by updating the introduction and adding a bit to the motivation section: cc578e7 |
Signed-off-by: Steve Peters <[email protected]>
Copied text from gazebosim/sdformat#659. Left a placeholder for an example of decomposing an existing model into separate model files using merge-include. Signed-off-by: Steve Peters <[email protected]>
Add abridged version of husky with sensors on a pan-tilt gimbal and show how to decompose it. Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
I've updated this quite a bit. The only thing I can think to add still is how to handle placement frames when doing a merge-include. What do you think? @EricCousineau-TRI @azeey |
Signed-off-by: Steve Peters <[email protected]>
I've added discussion of the placement frame in 1f663c0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you want to make alt. PR so you have primary authorship? (I'm fine either way)
Reviewable status: 0 of 2 files reviewed, 2 unresolved discussions (waiting on @scpeters)
composition/merge_proposal.md
line 120 at r5 (raw file):
~~~ <?xml version="1.0" ?>
nit Other snippets do not contain this header.
Consider removing here?
composition/merge_proposal.md
line 225 at r5 (raw file):
<pose>0.424 0 0.460 0 0 0</pose> <!-- Based on Intel realsense D435 (intrinsics and distortion not modeled)--> <sensor name="camera_pan_tilt" type="rgbd_camera">
nit Consider removing additional elements for now?
Or perhaps empty out contents and replace with ellipsis?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 1 of 1 files at r2.
Reviewable status: 1 of 2 files reviewed, 3 unresolved discussions (waiting on @EricCousineau-TRI and @scpeters)
composition/merge_proposal.md
line 108 at r5 (raw file):
For the entities to be merged, any explicit references to the implicit `__model__` frame are replaced with references to the proxy frame. Additionally, the name of the proxy frame is inserted anywhere the is an
nit: anywhere the -> anywhere there
composition/merge_proposal.md
line 487 at r5 (raw file):
<parent>base_link</parent> <axis> <xyz expressed_in="_merged__pan_tilt_sensors_3__model__">0 0 1</xyz>
hmm, it's not ideal to have to reference the proxy frame explicitly. It's more of an implementation detail, I think, and the naming pattern could change. Ideally, we would just reference the name of the included model corresponding to pan_tile_sensor3.sdf
here, but I'm not sure that would actually work. I don't want to block this, but it might be good to create an issue for it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 1 of 2 files reviewed, 3 unresolved discussions (waiting on @EricCousineau-TRI and @scpeters)
composition/merge_proposal.md
line 487 at r5 (raw file):
Previously, azeey (Addisu Z. Taddese) wrote…
hmm, it's not ideal to have to reference the proxy frame explicitly. It's more of an implementation detail, I think, and the naming pattern could change. Ideally, we would just reference the name of the included model corresponding to
pan_tile_sensor3.sdf
here, but I'm not sure that would actually work. I don't want to block this, but it might be good to create an issue for it.
Per VC, we should actually leave it, but:
- Warn that it's an implementation detail
- Suggest two options if a user needs to explicitly reference the included model frame
- (a) Make their own explicit alias frame in the included model, e.g.
arm_frame
- (b) Use
experimental:params
to inject the alias frame via//include
- (a) Make their own explicit alias frame in the included model, e.g.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure, I'll open a separate pull request so it will make more sense for you and Addisu to review it
Reviewed all commit messages.
Reviewable status: 1 of 2 files reviewed, 4 unresolved discussions (waiting on @EricCousineau-TRI and @scpeters)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see #74
Reviewable status: 1 of 2 files reviewed, 4 unresolved discussions (waiting on @azeey, @EricCousineau-TRI, and @scpeters)
composition/merge_proposal.md
line 108 at r5 (raw file):
Previously, azeey (Addisu Z. Taddese) wrote…
nit: anywhere the -> anywhere there
composition/merge_proposal.md
line 120 at r5 (raw file):
Previously, EricCousineau-TRI (Eric Cousineau) wrote…
nit Other snippets do not contain this header.
Consider removing here?
composition/merge_proposal.md
line 225 at r5 (raw file):
Previously, EricCousineau-TRI (Eric Cousineau) wrote…
nit Consider removing additional elements for now?
Or perhaps empty out contents and replace with ellipsis?
composition/merge_proposal.md
line 487 at r5 (raw file):
Previously, EricCousineau-TRI (Eric Cousineau) wrote…
Per VC, we should actually leave it, but:
- Warn that it's an implementation detail
- Suggest two options if a user needs to explicitly reference the included model frame
- (a) Make their own explicit alias frame in the included model, e.g.
arm_frame
- (b) Use
experimental:params
to inject the alias frame via//include
all changes look good, closing this in lieu of #74 |
🎉 New feature
Merging for Composition: Proposed behavior
Towards gazebosim/sdformat#658
Draft implementation: gazebosim/sdformat#659
Summary
See proposal text.
Test it
See preview: via sdformat.org
Checklist
Added testsUpdated migration guide (as needed)codecheck
passed~All tests passedNote to maintainers: Remember to use Squash-Merge
This change is![Reviewable](https://camo.githubusercontent.com/1541c4039185914e83657d3683ec25920c672c6c5c7ab4240ee7bff601adec0b/68747470733a2f2f72657669657761626c652e696f2f7265766965775f627574746f6e2e737667)