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

Add support for lightmaps in ogre2 #182

Merged
merged 5 commits into from
Dec 28, 2020
Merged

Add support for lightmaps in ogre2 #182

merged 5 commits into from
Dec 28, 2020

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Dec 2, 2020

depends on gazebosim/gz-common#132

main changes:

  • updated mesh factory to create mesh with multiple texture coordinate sets
  • added lightmap APIs to Material - users can choose which texture coordinate set to use for the lightmap
  • To keep things simple, lightmap is currently blended with the base albedo map using the Overlay bend mode (here's a description of the different blend modes).
  • fixed a transparency issue that happens when a grayscale albedo map is used.

@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Dec 2, 2020
@chapulina chapulina added the needs upstream release Blocked by a release of an upstream library label Dec 2, 2020
@chapulina
Copy link
Contributor

@osrf-jenkins run tests please 🙏

@chapulina
Copy link
Contributor

Ah no, triggered too soon 🤦‍♀️

Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Copy link
Contributor

I fixed code check and a failing test on 1d69e73.

@iche033 , I removed a big chunk of code from the test which didn't seem to be used. Please check if that was indeed unnecessary and if it was ok to remove it.

@chapulina chapulina removed the needs upstream release Blocked by a release of an upstream library label Dec 23, 2020
@codecov
Copy link

codecov bot commented Dec 23, 2020

Codecov Report

Merging #182 (0d62019) into main (d4406e1) will increase coverage by 0.05%.
The diff coverage is 75.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #182      +/-   ##
==========================================
+ Coverage   53.03%   53.08%   +0.05%     
==========================================
  Files         143      143              
  Lines       13505    13545      +40     
==========================================
+ Hits         7163     7191      +28     
- Misses       6342     6354      +12     
Impacted Files Coverage Δ
include/ignition/rendering/Material.hh 100.00% <ø> (ø)
include/ignition/rendering/base/BaseMaterial.hh 60.44% <23.07%> (-1.91%) ⬇️
ogre2/src/Ogre2Material.cc 95.13% <92.59%> (-0.30%) ⬇️
ogre2/src/Ogre2MeshFactory.cc 83.45% <100.00%> (+0.12%) ⬆️

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 d4406e1...0d62019. Read the comment docs.

Signed-off-by: Ian Chen <[email protected]>
@iche033
Copy link
Contributor Author

iche033 commented Dec 24, 2020

I removed a big chunk of code from the test which didn't seem to be used. Please check if that was indeed unnecessary and if it was ok to remove it.

actually the test was supposed to test and verify copying from this common::Material but it was doing a CopyFrom from the wrong material variable. I've updated the test in 0d62019.

@chapulina chapulina merged commit b7620f4 into main Dec 28, 2020
@chapulina chapulina deleted the lightmap branch December 28, 2020 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants