Fix using lightmap and emissive map together #1047
Merged
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
Summary
To be used by the Ionic demo world.
Currently lightmap is applied through the emissive map slot. This means you can't use emissive map together with lightmap (only one of them can be applied). This was done to workaround an unwanted red hightlight issue found in gz-rendering6 + ogre2.2. This issue seems to be fixed now (as of gz-rendering9 + ogre 2.3). So I restored back to the original way of applying lightmaps through the detail map slot and I don't see the red highlights. Here's a screenshot of the lightmap sdf world with this change:
Checklist
codecheck
passed (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-by
messages.