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

[backport fortress] camera info topic published with the right data #383

Merged
merged 9 commits into from
Oct 6, 2023

Conversation

ahcorde
Copy link
Contributor

@ahcorde ahcorde commented Sep 13, 2023

🦟 Bug fix

Summary

In Garden some PR were included to fix the camera topic info. This PR backport some of the relevant PRs

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • 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 and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

ahcorde and others added 5 commits September 13, 2023 14:01
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Closes #288

This PR extends the camera sensor functionality to support custom projection matrix based on input instrinics values. Specifically, it reads the lens <instrinsics> params from SDF, builds the projection matrix from the input values using code ported from Gazebo-classic, and set the camera to use this custom projection matrix.

Expanded the camera intrinsics integration test to compare image output from cameras with different intrinsics values.

Signed-off-by: Ian Chen <[email protected]>
@ahcorde ahcorde self-assigned this Sep 13, 2023
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Sep 13, 2023
@ahcorde ahcorde changed the title [nackport fortress] camera info topic published with the right data [backport fortress] camera info topic published with the right data Sep 13, 2023
@mjcarroll
Copy link
Contributor

Is this depending on another in gz-rendering? Some methods seem to be not defined in CI.

@ahcorde
Copy link
Contributor Author

ahcorde commented Sep 13, 2023

Is this depending on another in gz-rendering? Some methods seem to be not defined in CI.

Yes, this one gazebosim/gz-rendering#905

@mjcarroll mjcarroll added the needs upstream release Blocked by a release of an upstream library label Sep 13, 2023
cameraSdf->SetLensProjectionFy(intrinsicMatrix(1, 1));
cameraSdf->SetLensProjectionCx(intrinsicMatrix(0, 2));
cameraSdf->SetLensProjectionCy(intrinsicMatrix(1, 2));
}
Copy link
Contributor

Choose a reason for hiding this comment

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

also port this else block?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@ahcorde
Copy link
Contributor Author

ahcorde commented Oct 3, 2023

@iche033 can we make a ign-rendering6 release?

@iche033
Copy link
Contributor

iche033 commented Oct 3, 2023

@iche033 can we make a ign-rendering6 release?

yep on it.

While preparing for release, I ran into some warnings and like to clean it up: gazebosim/gz-rendering#929

@ahcorde
Copy link
Contributor Author

ahcorde commented Oct 4, 2023

@osrf-jenkins run tests please!

@ahcorde ahcorde removed the needs upstream release Blocked by a release of an upstream library label Oct 5, 2023
@ahcorde
Copy link
Contributor Author

ahcorde commented Oct 5, 2023

@iche033 thank you for the release

@iche033
Copy link
Contributor

iche033 commented Oct 5, 2023

the INTEGRATION_camera test is failing / crashing on actions. I backported more changes from gz-sensors8 to see if it fixes the issue. 1de1e8a

@iche033 iche033 merged commit 8741b9b into ign-sensors6 Oct 6, 2023
12 checks passed
@iche033 iche033 deleted the ahcorde/backport/camera_info_topic_sdf branch October 6, 2023 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants