Skip to content

[ogre1.x] Add support for wide angle camera #490

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

Merged
merged 30 commits into from
Dec 7, 2021
Merged

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Nov 18, 2021

🎉 New feature

Summary

Ported the wide angle camera feature from gazebo-classic. Added the base classes and ogre 1.x implementation.

Test it

Added a wide_angle_camera integration test and a demo.

Run the integration test with ogre render engine from your colcon workspace:

RENDER_ENGINE_VALUES=ogre ./build/ignition-rendering7/bin/INTEGRATION_wide_angle_camera

Build and run the wide_angle_camera demo:

wide_angle_camera_demo

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

@github-actions github-actions bot added the 🌱 garden Ignition Garden label Nov 18, 2021
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@chapulina chapulina added ogre1.x enhancement New feature or request labels Nov 18, 2021

/// \internal
/// \brief Private data pointer
private: std::unique_ptr<CameraLensPrivate> dataPtr;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we could add ignition-utils as a dependency so we can use the ImplPtr? I'll open an issue to do this in parallel, without blocking

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this dependency has been added in #492, so I recommend using ImplPtr in this new class

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

switched to use ImplPtr in 21d9f79

}
catch (...)
{
// std::cout << ex.what() << std::endl;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed. 3399e6d

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

codecov bot commented Nov 18, 2021

Codecov Report

Merging #490 (cdf6cd7) into main (39f59cc) will decrease coverage by 1.24%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #490      +/-   ##
==========================================
- Coverage   53.47%   52.22%   -1.25%     
==========================================
  Files         199      203       +4     
  Lines       19745    20215     +470     
==========================================
  Hits        10558    10558              
- Misses       9187     9657     +470     
Impacted Files Coverage Δ
include/ignition/rendering/Scene.hh 0.00% <ø> (ø)
include/ignition/rendering/WideAngleCamera.hh 0.00% <0.00%> (ø)
include/ignition/rendering/base/BaseScene.hh 0.00% <0.00%> (ø)
...ude/ignition/rendering/base/BaseWideAngleCamera.hh 0.00% <0.00%> (ø)
ogre/src/OgreScene.cc 26.22% <0.00%> (-0.35%) ⬇️
ogre/src/OgreWideAngleCamera.cc 0.00% <0.00%> (ø)
src/CameraLens.cc 0.00% <0.00%> (ø)
src/base/BaseScene.cc 70.69% <0.00%> (-1.34%) ⬇️

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 39f59cc...cdf6cd7. Read the comment docs.

@iche033 iche033 requested a review from ahcorde December 1, 2021 21:59
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just some small style comments, otherwise LGTM

@iche033 iche033 merged commit 8143932 into main Dec 7, 2021
@iche033 iche033 deleted the wide_angle_camera_ogre branch December 7, 2021 00:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request 🌱 garden Ignition Garden ogre1.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants