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

Partial fix for emissive map #501

Merged
merged 1 commit into from
Dec 3, 2021
Merged

Partial fix for emissive map #501

merged 1 commit into from
Dec 3, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Dec 3, 2021

Signed-off-by: Ian Chen ichen@osrfoundation.org

🦟 Bug fix

Partial fix for #499

Summary

When porting to ogre 2.2, lightmap and emissive map share the same texture slot. The fix adds a check to make sure we don't accidentally clear the emissive map when clearing out the lightmap texture.

There is still an issue of using grayscale emissive maps, in ogre2.2 it's being treated as RGB and so it's rendered red. This needs to be fixed next.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • 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

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@codecov
Copy link

codecov bot commented Dec 3, 2021

Codecov Report

Merging #501 (2907375) into ign-rendering6 (ae292a8) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-rendering6     #501   +/-   ##
===============================================
  Coverage           55.53%   55.53%           
===============================================
  Files                 195      195           
  Lines               19697    19698    +1     
===============================================
+ Hits                10938    10939    +1     
  Misses               8759     8759           
Impacted Files Coverage Δ
ogre2/src/Ogre2Material.cc 92.15% <100.00%> (+0.02%) ⬆️

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 ae292a8...2907375. Read the comment docs.

@iche033 iche033 merged commit f025610 into ign-rendering6 Dec 3, 2021
@iche033 iche033 deleted the fix_emissive_map branch December 3, 2021 19:43
@iche033 iche033 mentioned this pull request Dec 4, 2021
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants