Skip to content

USD to SDF: Added links#902

Merged
ahcorde merged 105 commits intosdf12from
ahcorde/usd_to_sdf_links
Apr 8, 2022
Merged

USD to SDF: Added links#902
ahcorde merged 105 commits intosdf12from
ahcorde/usd_to_sdf_links

Conversation

@ahcorde
Copy link
Copy Markdown
Collaborator

@ahcorde ahcorde commented Mar 22, 2022

🎉 New feature

Summary

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 30 commits March 9, 2022 13:22
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
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>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
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>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
adlarkin added 2 commits April 1, 2022 13:48
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Copy link
Copy Markdown
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.

I pushed a few commits with feedback, but I still have a few comments/questions which I left below. There are also a few other things:

  1. Would you mind adding tests that show adding links to models works as expected?
  2. I see the following warning when I build the code:
/sdf_to_usd/src/sdformat/usd/src/usd_parser/USDWorld.cc: In function 'sdf::v12::usd::UsdErrors sdf::v12::usd::parseUSDWorld(const string&, sdf::v12::World&)':
/sdf_to_usd/src/sdformat/usd/src/usd_parser/USDWorld.cc:227:30: warning: 'modelPtr' may be used uninitialized in this function [-Wmaybe-uninitialized]
             modelPtr->AddLink(*link);

Comment thread usd/src/usd_parser/USDLinks.hh Outdated
Comment thread usd/src/usd_parser/USDWorld.cc Outdated
Comment thread usd/src/usd_parser/USDWorld.cc
Comment thread usd/src/usd_parser/USDWorld.cc
Comment thread usd/src/usd_parser/USDWorld.cc Outdated
Comment thread usd/src/usd_parser/USDLinks.cc
Comment thread usd/src/usd_parser/USDLinks.cc Outdated
Comment thread usd/src/usd_parser/USDLinks.cc Outdated
Comment thread usd/src/usd_parser/USDLinks.cc Outdated
Comment thread usd/src/usd_parser/USDLinks.cc
@adlarkin adlarkin changed the title SDF to USD: Added links USD to SDF: Added links Apr 1, 2022
Base automatically changed from ahcorde/usd_to_sdf_models to sdf12 April 5, 2022 21:23
@adlarkin
Copy link
Copy Markdown
Contributor

adlarkin commented Apr 5, 2022

@ahcorde it looks like there are merge conflicts with sdf12, would you mind resolving them?

@ahcorde ahcorde requested a review from adlarkin April 5, 2022 22:06
@ahcorde
Copy link
Copy Markdown
Collaborator Author

ahcorde commented Apr 5, 2022

Done @adlarkin

Signed-off-by: ahcorde <ahcorde@gmail.com>
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Apr 6, 2022

Codecov Report

Merging #902 (a3a1ba5) into sdf12 (1b66d74) will increase coverage by 0.00%.
The diff coverage is 86.04%.

❗ Current head a3a1ba5 differs from pull request most recent head 4e0882d. Consider uploading reports for the commit 4e0882d to get more accurate results

@@           Coverage Diff           @@
##            sdf12     #902   +/-   ##
=======================================
  Coverage   87.70%   87.70%           
=======================================
  Files         104      105    +1     
  Lines       15109    15190   +81     
=======================================
+ Hits        13251    13323   +72     
- Misses       1858     1867    +9     
Impacted Files Coverage Δ
usd/src/cmd/usd2sdf.cc 85.18% <ø> (ø)
usd/src/usd_parser/USDWorld.cc 80.73% <65.38%> (-5.63%) ⬇️
usd/src/usd_parser/USDLinks.cc 95.00% <95.00%> (ø)
usd/src/usd_parser/USDTransforms.cc 67.56% <0.00%> (+2.02%) ⬆️

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 1b66d74...4e0882d. Read the comment docs.

Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Copy link
Copy Markdown
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.

I pushed a few changes, with the main one being using std::optional<sdf::Link> instead of a raw pointer to sdf::Link. I have a few final questions below.

Comment thread usd/src/usd_parser/USDLinks.cc
Comment thread usd/src/usd_parser/USDLinks.cc Outdated
Comment thread usd/src/usd_parser/USDLinks.cc Outdated
Comment thread usd/src/usd_parser/USDLinks.cc
Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde
Copy link
Copy Markdown
Collaborator Author

ahcorde commented Apr 8, 2022

@adlarkin ready for a final review

Comment thread usd/src/usd_parser/USDLinks.cc Outdated
@ahcorde ahcorde enabled auto-merge (squash) April 8, 2022 18:34
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
@ahcorde ahcorde merged commit 256fc6b into sdf12 Apr 8, 2022
@ahcorde ahcorde deleted the ahcorde/usd_to_sdf_links branch April 8, 2022 20:22
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.

6 participants