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

Backport material support to garden #2313

Merged
merged 3 commits into from
Mar 26, 2024

Conversation

quarkytale
Copy link
Contributor

@quarkytale quarkytale commented Feb 14, 2024

🦟 Bug fix

Fixes #10

Summary

Backport of support for Gazebo materials, #2269 and #2302

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • 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.

quarkytale and others added 2 commits February 14, 2024 00:12
* test script tag

Signed-off-by: Dharini Dutia <[email protected]>

* add dark grey before creating component

Signed-off-by: Dharini Dutia <[email protected]>

* material parser

Signed-off-by: Dharini Dutia <[email protected]>

* linters

Signed-off-by: Dharini Dutia <[email protected]>

* Update src/rendering/MaterialParser/MaterialParser.cc

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Dharini Dutia <[email protected]>
Signed-off-by: Dharini Dutia <[email protected]>

* fix configLoader, material struct and feedback

Signed-off-by: Dharini Dutia <[email protected]>

* default color and todos

Signed-off-by: Dharini Dutia <[email protected]>

* install/load one file, range based loop, hardcode dependent solid colors

Signed-off-by: Dharini Dutia <[email protected]>

* fix install_dir property

Signed-off-by: Dharini Dutia <[email protected]>

* credits, initializing cleanup

Signed-off-by: Dharini Dutia <[email protected]>

* eof

Signed-off-by: Dharini Dutia <[email protected]>

* reformat

Signed-off-by: Dharini Dutia <[email protected]>

* add integration test

Signed-off-by: Dharini Dutia <[email protected]>

* migration note

Signed-off-by: Dharini Dutia <[email protected]>

* intends, default case, invalid color

Signed-off-by: Dharini Dutia <[email protected]>

* optional materialValues, typo

Signed-off-by: Dharini Dutia <[email protected]>

* feedback

Signed-off-by: Dharini Dutia <[email protected]>

* size check

Signed-off-by: Dharini Dutia <[email protected]>

* get color values

Signed-off-by: Dharini Dutia <[email protected]>

* migration doc update

Signed-off-by: Dharini Dutia <[email protected]>

---------

Signed-off-by: Dharini Dutia <[email protected]>
Signed-off-by: Dharini Dutia <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
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 <[email protected]>
Signed-off-by: Dharini Dutia <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Feb 14, 2024
@azeey
Copy link
Contributor

azeey commented Feb 26, 2024

Looks like the Material tests are failing. @quarkytale could you take a look?

@azeey
Copy link
Contributor

azeey commented Feb 26, 2024

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 <[email protected]>
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
Copy link

codecov bot commented Mar 22, 2024

Codecov Report

Attention: Patch coverage is 84.37500% with 45 lines in your changes are missing coverage. Please review.

Project coverage is 64.91%. Comparing base (f2c2da9) to head (be0b7c0).

Files Patch % Lines
src/rendering/MaterialParser/ConfigLoader.cc 79.26% 45 Missing ⚠️
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.
📢 Have feedback on the report? Share it here.

@quarkytale quarkytale marked this pull request as ready for review March 22, 2024 20:25
@quarkytale quarkytale requested a review from azeey March 22, 2024 20:26
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
@azeey
Copy link
Contributor

azeey commented Mar 22, 2024

homebrew is broken because of octomap. @scpeters has removed the affected bottles, so I'll retrigger the homebrew build.

@quarkytale
Copy link
Contributor Author

Looks like the homebrew CI passed!

@azeey azeey merged commit 922eea7 into gz-sim7 Mar 26, 2024
11 checks passed
@azeey azeey deleted the quarkytale/backport_material_support branch March 26, 2024 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants