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

Merge: 6 -> 7 #932

Merged
merged 3 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,15 @@

### Gazebo Rendering 6.X

### Gazebo Rendering 6.6.2 (2023-10-03)

1. Backport camera intrinsics calculation : Refactor
* [Pull request #905](https://github.com/gazebosim/gz-rendering/pull/905)
* [Pull request #929](https://github.com/gazebosim/gz-rendering/pull/929)

1. Revert mesh viewer background color back to gray
* [Pull request #894](https://github.com/gazebosim/gz-rendering/pull/894)

### Gazebo Rendering 6.6.1 (2023-09-01)

1. Fixed light visual in OGRE
Expand Down
12 changes: 6 additions & 6 deletions test/common_test/Camera_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -335,12 +335,12 @@ TEST_F(CameraTest, IntrinsicMatrix)
EXPECT_DOUBLE_EQ(cameraIntrinsics(1, 2), 120);

// Verify rest of the intrinsics
EXPECT_EQ(cameraIntrinsics(0, 1), 0);
EXPECT_EQ(cameraIntrinsics(1, 0), 0);
EXPECT_EQ(cameraIntrinsics(0, 1), 0);
EXPECT_EQ(cameraIntrinsics(2, 0), 0);
EXPECT_EQ(cameraIntrinsics(2, 1), 0);
EXPECT_EQ(cameraIntrinsics(2, 2), 1);
EXPECT_DOUBLE_EQ(cameraIntrinsics(0, 1), 0);
EXPECT_DOUBLE_EQ(cameraIntrinsics(1, 0), 0);
EXPECT_DOUBLE_EQ(cameraIntrinsics(0, 1), 0);
EXPECT_DOUBLE_EQ(cameraIntrinsics(2, 0), 0);
EXPECT_DOUBLE_EQ(cameraIntrinsics(2, 1), 0);
EXPECT_DOUBLE_EQ(cameraIntrinsics(2, 2), 1);

// Verify that changing camera size changes intrinsics
height = 1000;
Expand Down
Loading