USD to SDF: Added Lights attached to models#903
Merged
Conversation
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>
… ahcorde/usd_to_sdf_transforms
…nto ahcorde/usd_to_sdf_lights
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: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
… ahcorde/usd_to_sdf_transforms
Signed-off-by: ahcorde <ahcorde@gmail.com>
…nto ahcorde/usd_to_sdf_lights
Signed-off-by: ahcorde <ahcorde@gmail.com>
… ahcorde/usd_to_sdf_transforms
…nto ahcorde/usd_to_sdf_lights
Signed-off-by: ahcorde <ahcorde@gmail.com>
… ahcorde/usd_to_sdf_transforms
…nto ahcorde/usd_to_sdf_lights
…ahcorde/usd_to_sdf_sensors
Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
…ahcorde/usd_to_sdf_sensors
… ahcorde/usd_to_sdf_link_lights
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
… ahcorde/usd_to_sdf_link_lights
Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
… ahcorde/usd_to_sdf_link_lights
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
adlarkin
approved these changes
Apr 14, 2022
Codecov Report
@@ Coverage Diff @@
## sdf12 #903 +/- ##
=======================================
Coverage 65.38% 65.38%
=======================================
Files 2 2
Lines 26 26
=======================================
Hits 17 17
Misses 9 9 Continue to review full report at Codecov.
|
adlarkin
reviewed
Apr 14, 2022
Contributor
There was a problem hiding this comment.
@ahcorde I added some tests in 7a4ce0a and found that I had to make the following changes in order for the tests to pass (fixes were made in 72a9eec):
- when searching for a link in the model, this should be done with
ignition::common::basename(linkName), notlinkName - before searching if
modelPtrhas a link namedignition::common::basename(linkName), we need to make sure the light prim actually has a model ancestor. Otherwise,modelPtrandlinkNamecontain data relevant to a previously parsed model that doesn't contain this light, and so this light should be attached to the world.
I also ran the usd2sdf converter on the test/usd/upAxisZ.usda file and examined the output.sdf file, and it seems correct to me. However, before I merge this, would you mind taking one last look at it to make sure I didn't break anything on other files you've been testing?
Signed-off-by: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎉 New feature
Summary
USD to SDF: Added Lights attached to models
Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.