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

USD to SDF: some fixes #991

Merged
merged 7 commits into from
Apr 20, 2022
Merged

USD to SDF: some fixes #991

merged 7 commits into from
Apr 20, 2022

Conversation

ahcorde
Copy link
Collaborator

@ahcorde ahcorde commented Apr 19, 2022

Signed-off-by: ahcorde ahcorde@gmail.com

🦟 Bug fix

Summary

Fixed

  • Link, we were using the copy of the link not the reference
  • Link scale
  • cylinder collision scale
  • path to get the transforms

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: ahcorde <ahcorde@gmail.com>
@ahcorde ahcorde added the usd label Apr 19, 2022
@ahcorde ahcorde requested a review from adlarkin April 19, 2022 13:26
@ahcorde ahcorde self-assigned this Apr 19, 2022
@ahcorde ahcorde requested review from azeey and scpeters as code owners April 19, 2022 13:26
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Apr 19, 2022
Signed-off-by: ahcorde <ahcorde@gmail.com>
Copy link
Contributor

@adlarkin adlarkin left a comment

Choose a reason for hiding this comment

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

LGTM - just one question before merging.

@@ -302,6 +303,8 @@ namespace usd
}
sdf::usd::ParseUSDLinks(
prim, linkName, optionalLink, usdData, scale->second);
*linkInserted = optionalLink.value();
linkScaleMap[linkName] = scale->second;
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure that this line is needed. A few lines above, we get the iterator to the pairing of the link name and scale, and then when sdf::usd::ParseUSDLinks is called before this assignment, the scale is passed as a mutable reference. So, I believe the assignment being done here (i.e., updating the link's scale) should be done automatically since we are using iterators and references. Do things still work if this line is removed?

@codecov-commenter
Copy link

codecov-commenter commented Apr 19, 2022

Codecov Report

Merging #991 (413f4f2) into sdf12 (a593db2) will not change coverage.
The diff coverage is n/a.

❗ Current head 413f4f2 differs from pull request most recent head afa216a. Consider uploading reports for the commit afa216a to get more accurate results

@@           Coverage Diff           @@
##            sdf12     #991   +/-   ##
=======================================
  Coverage   65.38%   65.38%           
=======================================
  Files           2        2           
  Lines          26       26           
=======================================
  Hits           17       17           
  Misses          9        9           

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 a593db2...afa216a. Read the comment docs.

Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde
Copy link
Collaborator Author

ahcorde commented Apr 19, 2022

@osrf-jenkins retest this please

@ahcorde ahcorde merged commit 1902c16 into sdf12 Apr 20, 2022
@ahcorde ahcorde deleted the ahcorde/usd_to_sdf/fixes branch April 20, 2022 07:41
chapulina added a commit that referenced this pull request May 9, 2022
* USD to SDF: Added Lights attached to models (#903)

Signed-off-by: ahcorde <ahcorde@gmail.com>
Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>

* USD to SDF: Added diff drive plugin (#904)

Signed-off-by: ahcorde <ahcorde@gmail.com>
Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>

* USD to SDF: some fixes (#991)

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Added equality operators to Plugin (#912)

* Added convenience constructor to plugin

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added equality operators to Plugin

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Remove common dependency

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Fixed test

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Co-authored-by: Nate Koenig <nkoenig@users.noreply.github.com>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress usd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants