Skip to content

USD to SDF: material fixed#895

Merged
adlarkin merged 11 commits intosdf12from
ahcorde/usd_to_sdf/material_fixes
Mar 24, 2022
Merged

USD to SDF: material fixed#895
adlarkin merged 11 commits intosdf12from
ahcorde/usd_to_sdf/material_fixes

Conversation

@ahcorde
Copy link
Copy Markdown
Collaborator

@ahcorde ahcorde commented Mar 22, 2022

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

🦟 Bug fix

Summary

  • Set the workflow type
  • remove the texture file before copy it if this already exists
  • Avoid find resources in the local path

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.

@ahcorde
USD to SDF: material fixed
ee36708 
Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde ahcorde added the usd label Mar 22, 2022
@ahcorde ahcorde requested a review from adlarkin March 22, 2022 09:39
@ahcorde ahcorde requested review from azeey and scpeters as code owners March 22, 2022 09:39
@ahcorde ahcorde self-assigned this Mar 22, 2022
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Mar 22, 2022
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Mar 22, 2022 •
edited
Loading

Codecov Report

Merging #895 (c60ebc9) into sdf12 (ae5c4d6) will decrease coverage by 0.09%.
The diff coverage is 55.26%.

@@            Coverage Diff             @@
##            sdf12     #895      +/-   ##
==========================================
- Coverage   88.12%   88.02%   -0.10%     
==========================================
  Files         100      100              
  Lines       14667    14692      +25     
==========================================
+ Hits        12925    12933       +8     
- Misses       1742     1759      +17
Impacted Files Coverage Δ
usd/src/usd_parser/USDMaterial.cc 59.44% <55.26%> (-4.43%) ⬇️

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 ae5c4d6...c60ebc9. Read the comment docs.

@ahcorde
Copy link
Copy Markdown
Collaborator Author

ahcorde commented Mar 22, 2022

@osrf-jenkins retest this please

1 similar comment
@ahcorde
Copy link
Copy Markdown
Collaborator Author

ahcorde commented Mar 22, 2022

@osrf-jenkins retest this please

@ahcorde ahcorde mentioned this pull request Mar 22, 2022
Closed
adlarkin
adlarkin reviewed Mar 23, 2022
View reviewed changes
Comment thread usd/src/usd_parser/USDMaterial.cc Outdated
@ahcorde ahcorde requested a review from adlarkin March 23, 2022 12:00
ahcorde added 3 commits March 23, 2022 13:05
@ahcorde
Merge remote-tracking branch 'origin/sdf12' into ahcorde/usd_to_sdf/m…
44ff7a4 
…aterial_fixes
@ahcorde
Fixed compile error
72eb274 
Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde
Add a number suffix if the copied files exists
d529bf4 
Signed-off-by: ahcorde <ahcorde@gmail.com>
adlarkin
adlarkin reviewed Mar 23, 2022
View reviewed changes
Comment thread usd/src/usd_parser/USDMaterial.cc Outdated
Comment thread usd/src/usd_parser/USDMaterial.cc Outdated
Comment thread usd/src/usd_parser/USDMaterial.cc Outdated
Comment thread usd/src/usd_parser/USDMaterial.cc Outdated
Comment thread usd/src/usd_parser/USDMaterial.cc
Comment thread usd/src/usd_parser/USDMaterial.cc Outdated
ahcorde added 3 commits March 23, 2022 22:52
@ahcorde
Improved copyfile functions
243988d 
Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde
Fixed docs
d4940bf 
Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde
Merge remote-tracking branch 'origin/sdf12' into ahcorde/usd_to_sdf/m…
c1ef826 
…aterial_fixes
@ahcorde ahcorde requested a review from adlarkin March 23, 2022 21:53
@ahcorde
make linters happy
0f22cce 
Signed-off-by: ahcorde <ahcorde@gmail.com>
adlarkin
adlarkin reviewed Mar 23, 2022
View reviewed changes
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.

LGTM, just one final question.

Comment thread usd/src/usd_parser/USDData_TEST.cc Outdated
@ahcorde ahcorde requested a review from adlarkin March 24, 2022 10:58
@adlarkin adlarkin merged commit b235400 into sdf12 Mar 24, 2022
@adlarkin adlarkin deleted the ahcorde/usd_to_sdf/material_fixes branch March 24, 2022 15:10
@osrf-triage
Copy link
Copy Markdown

osrf-triage commented Apr 13, 2022

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

Reviewers

@azeey azeey Awaiting requested review from azeey azeey is a code owner

@scpeters scpeters Awaiting requested review from scpeters scpeters is a code owner

1 more reviewer

@adlarkin adlarkin adlarkin approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@ahcorde ahcorde

Labels

🏯 fortress Ignition Fortress usd

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@ahcorde @codecov-commenter @osrf-triage @azeey @adlarkin @j-rivero