Port Camera Distortion effect from gazebo11 #502

WilliamLewww · 2021-12-03T20:27:06Z

🎉 Distortion pass

Summary

Ported the distortion effect from Gazebo Classic to Ignition.

Checklist

Signed all commits for DCO
Added tests
Added example and/or tutorial
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

ogre/include/ignition/rendering/ogre/OgreDistortionPass.hh

ogre/src/OgreDistortionPass.cc

ogre/src/media/materials/scripts/distortion.compositor

ogre/src/media/materials/scripts/distortion.material

src/DistortionPass.cc

ahcorde

linters are failing https://github.com/ignitionrobotics/ign-rendering/runs/4434396293?check_suite_focus=true

codecov · 2021-12-06T20:14:04Z

Codecov Report

Merging #502 (a20d58f) into ign-rendering6 (504d8ce) will decrease coverage by 0.72%.
The diff coverage is 0.37%.

❗ Current head a20d58f differs from pull request most recent head 423f819. Consider uploading reports for the commit 423f819 to get more accurate results

@@                Coverage Diff                 @@
##           ign-rendering6     #502      +/-   ##
==================================================
- Coverage           55.42%   54.70%   -0.73%     
==================================================
  Files                 195      198       +3     
  Lines               19763    20029     +266     
==================================================
+ Hits                10954    10956       +2     
- Misses               8809     9073     +264

Impacted Files	Coverage Δ
...lude/ignition/rendering/base/BaseDistortionPass.hh	`0.00% <0.00%> (ø)`
src/DistortionPass.cc	`0.00% <0.00%> (ø)`
ogre/src/OgreDistortionPass.cc	`0.43% <0.43%> (ø)`
...e/ignition/rendering/base/BaseGaussianNoisePass.hh	`100.00% <0.00%> (+3.33%)`	⬆️

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 504d8ce...423f819. Read the comment docs.

iche033

nice, did a first pass review.

Can you port this fix over? gazebosim/gazebo-classic#3136

include/ignition/rendering/DistortionPass.hh

ogre/include/ignition/rendering/ogre/OgreDistortionPass.hh

ogre/src/media/materials/programs/camera_distortion_map_vs.glsl

ogre/include/ignition/rendering/ogre/OgreDistortionPass.hh

iche033

can you add an integration test to render_pass.cc? You can take a look at the test in gazebo:
https://github.com/osrf/gazebo/blob/gazebo11/test/integration/camera_sensor.cc#L697

iche033 · 2021-12-08T21:14:44Z

to run ogre 1.x tests, you can set the RENDER_ENGINE_VALUES to ogre, e.g.

RENDER_ENGINE_VALUES=ogre ./bin/INTEGRATION_render_pass

iche033 · 2021-12-09T19:40:58Z

There are a few windows warnings:
https://build.osrfoundation.org/job/ign_rendering-pr-win/2317/msbuild/new/

The newly added integration test is failing on homebrew which runs ogre 1.x tests:
https://build.osrfoundation.org/job/ignition_rendering-ci-pr_any-homebrew-amd64/2135/testReport/(root)/RenderPass_RenderPassTest/Distortion_ogre/

can you take a look?

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

include/ignition/rendering/base/BaseDistortionPass.hh

test/integration/render_pass.cc

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

…ng into wlew/distortion

iche033

looks good to me.

osrf-triage · 2022-03-01T18:30:58Z

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-03-01-citadel-edifice-fortress/1313/1

github-actions bot added the 🏯 fortress Ignition Fortress label Dec 3, 2021

osrf-triage added this to Inbox in Core development Dec 3, 2021

ahcorde requested changes Dec 4, 2021

View reviewed changes

Core development automation moved this from Inbox to In review Dec 4, 2021

WilliamLewww marked this pull request as ready for review December 6, 2021 18:33

WilliamLewww requested a review from iche033 as a code owner December 6, 2021 18:33

ahcorde requested changes Dec 6, 2021

View reviewed changes

scpeters changed the title ~~Distortion pass~~ Port Camera Distortion effect from gazebo11 Dec 6, 2021

WilliamLewww force-pushed the wlew/distortion branch 3 times, most recently from 708a7ba to cc4c301 Compare December 6, 2021 19:37

iche033 reviewed Dec 7, 2021

View reviewed changes

WilliamLewww force-pushed the wlew/distortion branch 5 times, most recently from 86425b3 to 155a404 Compare December 7, 2021 22:04

iche033 reviewed Dec 8, 2021

View reviewed changes

WilliamLewww force-pushed the wlew/distortion branch 4 times, most recently from 8b999b2 to 71aad9c Compare December 16, 2021 19:21

WilliamLewww added 5 commits December 16, 2021 20:53

Added BaseDistortionPass.hh

ec2f7c4

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Added OgreDistortionPass

feb5d4e

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Added distortion materials

7e1203f

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Copied distortion logic from gazebo classic

b0bfb58

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Added distortion pass

6de312b

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

WilliamLewww added 9 commits December 16, 2021 20:53

Added distortion from gazebo classic

931311e

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Added code suggestions

8f1307d

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Fixed formatting

2e275b1

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Added code suggestions

580ca85

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Added changes from #3136

55b6f57

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Added integration test for distortion pass

577f57e

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Added static casts to prevent windows warnings

57b5b2d

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Fixed homebrew test failures

4517f5c

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Added casting to fix windows build warnings

eac3d16

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

WilliamLewww force-pushed the wlew/distortion branch from 4805781 to eac3d16 Compare December 17, 2021 04:53

Merge branch 'ign-rendering6' into wlew/distortion

cab01a2

chapulina requested review from ahcorde and iche033 December 20, 2021 19:48

iche033 reviewed Dec 20, 2021

View reviewed changes

include/ignition/rendering/base/BaseDistortionPass.hh Outdated Show resolved Hide resolved

test/integration/render_pass.cc Outdated Show resolved Hide resolved

test/integration/render_pass.cc Show resolved Hide resolved

WilliamLewww added 2 commits December 20, 2021 13:36

Added code suggestions

d8ce5b0

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

Merge branch 'wlew/distortion' of github.com:WilliamLewww/ign-renderi…

94b0591

…ng into wlew/distortion

iche033 approved these changes Dec 21, 2021

View reviewed changes

Merge branch 'ign-rendering6' into wlew/distortion

423f819

ahcorde approved these changes Dec 21, 2021

View reviewed changes

ahcorde merged commit 5e19061 into gazebosim:ign-rendering6 Dec 21, 2021

Core development automation moved this from In review to Done Dec 21, 2021

chapulina moved this from Done to Highlights in Core development Dec 22, 2021

darksylinc mentioned this pull request Jan 8, 2022

Rename Ogre2IgnHlmsCustomizations to Ogre2IgnHlmsSphericalClipMinDistance #534

Merged

7 tasks

peci1 mentioned this pull request Jan 31, 2022

Add distortion to camera sensors gazebosim/gz-sensors#107

Closed

j-rivero removed this from Highlights in Core development May 6, 2022

iche033 mentioned this pull request Aug 14, 2023

Support ImageBrownDistortionModel in ogre2 #697

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port Camera Distortion effect from gazebo11 #502

Port Camera Distortion effect from gazebo11 #502

WilliamLewww commented Dec 3, 2021

ahcorde left a comment

codecov bot commented Dec 6, 2021 •

edited

iche033 left a comment

iche033 left a comment

iche033 commented Dec 8, 2021 •

edited

iche033 commented Dec 9, 2021

iche033 left a comment

osrf-triage commented Mar 1, 2022

Port Camera Distortion effect from gazebo11 #502

Port Camera Distortion effect from gazebo11 #502

Conversation

WilliamLewww commented Dec 3, 2021

🎉 Distortion pass

Summary

Checklist

ahcorde left a comment

Choose a reason for hiding this comment

codecov bot commented Dec 6, 2021 • edited

Codecov Report

iche033 left a comment

Choose a reason for hiding this comment

iche033 left a comment

Choose a reason for hiding this comment

iche033 commented Dec 8, 2021 • edited

iche033 commented Dec 9, 2021

iche033 left a comment

Choose a reason for hiding this comment

osrf-triage commented Mar 1, 2022

codecov bot commented Dec 6, 2021 •

edited

iche033 commented Dec 8, 2021 •

edited