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

Support wide angle camera #744

Merged
merged 9 commits into from
Nov 22, 2021
Merged

Support wide angle camera #744

merged 9 commits into from
Nov 22, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Nov 10, 2021

🎉 New feature

Summary

Updates the Sensor DOM to support parsing wide angle cameras.

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 🌱 garden Ignition Garden 🏯 fortress Ignition Fortress labels Nov 10, 2021
@codecov-commenter
Copy link

codecov-commenter commented Nov 10, 2021

Codecov Report

Merging #744 (538856f) into sdf12 (f2a286c) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##            sdf12     #744   +/-   ##
=======================================
  Coverage   88.62%   88.62%           
=======================================
  Files          76       76           
  Lines       11785    11790    +5     
=======================================
+ Hits        10444    10449    +5     
  Misses       1341     1341           
Impacted Files Coverage Δ
src/Sensor.cc 90.70% <100.00%> (+0.15%) ⬆️

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 f2a286c...538856f. Read the comment docs.

Copy link
Collaborator

@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.

can you add some tests?

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

iche033 commented Nov 10, 2021

added integration test in 2800f2c

@scpeters scpeters requested a review from ahcorde November 11, 2021 18:25
src/Sensor.cc Outdated
@@ -64,7 +64,8 @@ const std::vector<std::string> sensorTypeStrs =
"navsat",
"segmentation_camera",
"boundingbox_camera",
"custom"
"custom",
"wideanglecamera"
Copy link
Contributor

Choose a reason for hiding this comment

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

We should document this string here: https://github.com/ignitionrobotics/sdformat/blob/f2a286cbf89aca7daa722a70a357e0de32224372/sdf/1.9/sensor.sdf#L10-L36

Most other cameras are using camel_case (at least partially), can we do it here too? i.e. wideangle_camera or wide_angle_camera, or all of them to be safe?

Copy link
Member

Choose a reason for hiding this comment

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

the existing convention with gazebo classic is wideanglecamera. I think we can choose to add alternates, but I would keep wideanglecamera for backwards compatibility

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed wideanglecamera to wide_angle_camera here. Also updated the Load function to check for both wide_angle_came and wideanglecamera when loading the sdf for backward compatibility.
8aacb98

@scpeters scpeters merged commit 8ddf022 into sdf12 Nov 22, 2021
@scpeters scpeters deleted the wide_angle_camera_12 branch November 22, 2021 20:29
@MrKeith99
Copy link

Is there any possibility to add this feature in Gazebo Fortress as well?
I am struggling to use Humble and gz_ros2_control within the Gazebo Fortress or Gazebo Garden.

@iche033
Copy link
Contributor Author

iche033 commented Jan 7, 2025

the PRs to add wide angle camera support in gz-rendering (gazebosim/gz-rendering#490 and gazebosim/gz-rendering#733) include ABI breaking changes so I think it'll be difficult to backport all wide angle camera related changes to Fortress.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress 🌱 garden Ignition Garden
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants