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

Cherry-pick #383 to sdf9: Fix supported shader types (normal_map_X_space) #385

Merged
merged 1 commit into from
Oct 9, 2020

Conversation

scpeters
Copy link
Member

@scpeters scpeters commented Oct 9, 2020

Cherry-pick #383 forward to sdf9 and amended to include change in sdf/1.7. Use rebase and merge.

original description:

Going over models on the Gazebo model database, I don't see a single model that uses:

Instead, there are models using:

I suspect that the documentation has been wrong all along, and when the sdf::Material class was created, the error was propagated.

The fix here changes the documentation to the "correct" values, but keeps the "old" values supported to avoid breaking existing code.

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@scpeters scpeters requested a review from chapulina October 9, 2020 18:39
@codecov-io
Copy link

Codecov Report

Merging #385 into sdf9 will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             sdf9     #385      +/-   ##
==========================================
- Coverage   86.27%   86.25%   -0.02%     
==========================================
  Files          59       59              
  Lines        9177     9181       +4     
==========================================
+ Hits         7917     7919       +2     
- Misses       1260     1262       +2     
Impacted Files Coverage Δ
src/Material.cc 97.94% <100.00%> (-1.36%) ⬇️

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 b6c761b...d3c94de. Read the comment docs.

@scpeters scpeters merged commit dd7ce2e into gazebosim:sdf9 Oct 9, 2020
@scpeters scpeters deleted the pick_shader_type_9 branch October 9, 2020 22:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants