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 forward to master: Fix supported shader types (normal_map_X_space) #387

Merged
merged 1 commit into from
Oct 12, 2020

Conversation

scpeters
Copy link
Member

Cherry-pick #383 forward to master, and I amended it to include the change in the sdf/1.8 folder. 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.

@scpeters scpeters requested a review from chapulina October 12, 2020 18:27
@codecov-io
Copy link

Codecov Report

Merging #387 into master will decrease coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #387      +/-   ##
==========================================
- Coverage   87.40%   87.38%   -0.02%     
==========================================
  Files          60       60              
  Lines        9337     9341       +4     
==========================================
+ Hits         8161     8163       +2     
- Misses       1176     1178       +2     
Impacted Files Coverage Δ
src/Material.cc 97.84% <100.00%> (-1.42%) ⬇️

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 113bf26...f48a4fc. Read the comment docs.

@scpeters scpeters merged commit 144f82c into master Oct 12, 2020
@scpeters scpeters deleted the pick_shader_type_11 branch October 12, 2020 21:18
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