Backport material support to garden #2313
Merged
Conversation
This file contains 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
* test script tag Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * add dark grey before creating component Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * material parser Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * linters Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * Update src/rendering/MaterialParser/MaterialParser.cc Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com> Signed-off-by: Dharini Dutia <dharinidutia@gmail.com> Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * fix configLoader, material struct and feedback Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * default color and todos Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * install/load one file, range based loop, hardcode dependent solid colors Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * fix install_dir property Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * credits, initializing cleanup Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * eof Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * reformat Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * add integration test Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * migration note Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * intends, default case, invalid color Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * optional materialValues, typo Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * feedback Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * size check Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * get color values Signed-off-by: Dharini Dutia <dharini@openrobotics.org> * migration doc update Signed-off-by: Dharini Dutia <dharini@openrobotics.org> --------- Signed-off-by: Dharini Dutia <dharini@openrobotics.org> Signed-off-by: Dharini Dutia <dharinidutia@gmail.com> Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Edited gazebo.material file to remove multiple passes in solid colors. Refactored the parser based on Gazebo's style guide. Signed-off-by: Dharini Dutia <dharini@openrobotics.org> Signed-off-by: Dharini Dutia <dharinidutia@gmail.com> Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
|
Looks like the |
|
Also, we'll need the equivalent of gazebo-release/gz-sim8-release#5 for gz-sim7 before releasing. Would you be able to open a PR for that as well? |
Signed-off-by: Dharini Dutia <dharini@openrobotics.org>
quarkytale
added a commit
to gazebo-release/gz-sim7-release
that referenced
this pull request
Mar 22, 2024
gazebosim/gz-sim#2313 adds a file to usr/share/gz/gz-sim7/media, this change prevents CI warnings as per gazebo-release/gz-sim8-release/#5
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## gz-sim7 #2313 +/- ##
===========================================
+ Coverage 64.72% 64.91% +0.18%
===========================================
Files 357 360 +3
Lines 29160 29448 +288
===========================================
+ Hits 18873 19115 +242
- Misses 10287 10333 +46 ☔ View full report in Codecov by Sentry. |
azeey
pushed a commit
to gazebo-release/gz-sim7-release
that referenced
this pull request
Mar 22, 2024
gazebosim/gz-sim#2313 adds a file to usr/share/gz/gz-sim7/media, this change prevents CI warnings as per gazebo-release/gz-sim8-release/#5
|
homebrew is broken because of |
|
Looks like the homebrew CI passed! |
ahcorde
approved these changes
Mar 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
🦟 Bug fix
Fixes #10
Summary
Backport of support for Gazebo materials, #2269 and #2302
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.