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

sdf -> usd converter: add joints #837

Merged
merged 21 commits into from
Feb 25, 2022
Merged

sdf -> usd converter: add joints #837

merged 21 commits into from
Feb 25, 2022

Conversation

adlarkin
Copy link
Contributor

@adlarkin adlarkin commented Jan 28, 2022

🎉 New feature

Summary

Adds support for converting joints to their USD representation when parsing a SDF model to USD. Currently, the following joint types are supported:

  • revolute
  • ball
  • fixed
  • prismatic

Test it

You can run the unit test that has been added (sdformat/usd/src/sdf_parser/Joint_Sdf2Usd_TEST.cc)

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • 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.

ahcorde and others added 3 commits January 25, 2022 18:21
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
@codecov-commenter
Copy link

codecov-commenter commented Jan 28, 2022

Codecov Report

Merging #837 (c03c363) into sdf12 (ec11f63) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##            sdf12     #837   +/-   ##
=======================================
  Coverage   90.88%   90.88%           
=======================================
  Files          78       78           
  Lines       12636    12636           
=======================================
  Hits        11484    11484           
  Misses       1152     1152           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ec11f63...c03c363. Read the comment docs.

adlarkin and others added 5 commits January 31, 2022 22:29
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
@adlarkin adlarkin requested a review from ahcorde February 2, 2022 03:57
@adlarkin adlarkin marked this pull request as ready for review February 2, 2022 03:58
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Base automatically changed from ahcorde/sdf_to_usd_links to sdf12 February 18, 2022 16:34
@scpeters scpeters added the usd label Feb 21, 2022
@scpeters
Copy link
Member

can you resolve the conflicts?

@ahcorde
Copy link
Collaborator

ahcorde commented Feb 21, 2022

@osrf-jenkins retest this please

usd/src/sdf_parser/Joint.cc Outdated Show resolved Hide resolved
usd/src/sdf_parser/Joint.cc Show resolved Hide resolved
usd/src/sdf_parser/Joint.cc Show resolved Hide resolved
usd/src/sdf_parser/Joint.cc Show resolved Hide resolved
usd/src/sdf_parser/Joint.cc Outdated Show resolved Hide resolved
usd/src/sdf_parser/Joint.cc Outdated Show resolved Hide resolved
usd/src/sdf_parser/Joint.cc Outdated Show resolved Hide resolved
usd/src/sdf_parser/Joint.cc Show resolved Hide resolved
usd/src/sdf_parser/Joint.cc Outdated Show resolved Hide resolved
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Copy link
Collaborator

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pushed some code to address the feedback

Copy link
Member

@scpeters scpeters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only two minor comments remaining

I still don't get the Y-axis revolute joint issue, but there are todo comments there, so we can come back to it at some point

usd/src/sdf_parser/Joint.cc Outdated Show resolved Hide resolved
usd/src/sdf_parser/Joint.cc Outdated Show resolved Hide resolved
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
@adlarkin
Copy link
Contributor Author

I still don't get the Y-axis revolute joint issue, but there are todo comments there, so we can come back to it at some point

Sounds good, @ahcorde may have some more info about this - I left a comment with some more background/context: #837 (comment)

All other feedback should be addressed now, so this is ready for final review.

@adlarkin adlarkin merged commit 5e3605f into sdf12 Feb 25, 2022
@adlarkin adlarkin deleted the adlarkin/sdf_to_usd_joints branch February 25, 2022 04:59
@ahcorde ahcorde mentioned this pull request Mar 4, 2022
8 tasks
@osrf-triage
Copy link

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants