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

Set lens intrinsics in Depth and Rgbd camera sensors (backport #390) #486

Merged
merged 5 commits into from
Dec 4, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 21, 2024

Refactor projection matrix utility functions to CameraSensorUtil and set lens intrinsics in Depth and Rgbd camera sensors


This is an automatic backport of pull request #390 done by Mergify.

* Refactor projection matrix utility functions to CameraSensorUtil and set lens intrinsics in Depth and Rgbd camera sensors
---------

Signed-off-by: Shameek Ganguly <shameekarcanesphinx@gmail.com>
(cherry picked from commit bd695b2)

# Conflicts:
#	src/CameraSensor.cc
#	src/DepthCameraSensor.cc
#	src/RgbdCameraSensor.cc
@mergify mergify bot requested a review from iche033 as a code owner November 21, 2024 11:30
@mergify mergify bot added the conflicts label Nov 21, 2024
Copy link
Author

mergify bot commented Nov 21, 2024

Cherry-pick of bd695b2 has failed:

On branch mergify/bp/ign-sensors6/pr-390
Your branch is up to date with 'origin/ign-sensors6'.

You are currently cherry-picking commit bd695b2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/CMakeLists.txt
	new file:   src/CameraSensorUtil.cc
	new file:   src/CameraSensorUtil.hh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/CameraSensor.cc
	both modified:   src/DepthCameraSensor.cc
	both modified:   src/RgbdCameraSensor.cc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde ahcorde mentioned this pull request Nov 21, 2024
9 tasks
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde
Copy link
Contributor

ahcorde commented Dec 4, 2024

There are some inconsistent dll linkage on Windows. any thoughts? @iche033 @azeey

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde ahcorde merged commit 7cd222e into ign-sensors6 Dec 4, 2024
10 checks passed
@ahcorde ahcorde deleted the mergify/bp/ign-sensors6/pr-390 branch December 4, 2024 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants