Skip to content

Commit 1cb383a

Browse files
authored
Merge pull request #1155 from gazebosim/merge_8_9_20250811
Merge 8 -> 9
2 parents b73d296 + 46301bd commit 1cb383a

File tree

3 files changed

+58
-4
lines changed

3 files changed

+58
-4
lines changed

Changelog.md

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Gazebo Rendering
1+
# Gazebo Rendering
22

33
### Gazebo Rendering 9.X
44

@@ -205,9 +205,55 @@
205205
1. Add projection matrix set/get functions to Ogre Depth camera
206206
* [Pull request #928](https://github.com/gazebosim/gz-rendering/pull/928)
207207

208-
### Gazebo Rendering 8.X
208+
## Gazebo Rendering 8.X
209209

210-
### Gazebo Rendering 8.2.0
210+
### Gazebo Rendering 8.2.2 (2025-01-30)
211+
212+
1. Fix RenderingIface_TEST for ogre2 when there is no display
213+
* [Pull request #1098](https://github.com/gazebosim/gz-rendering/pull/1098)
214+
215+
1. Better approach to use std::variant
216+
* [Pull request #1093](https://github.com/gazebosim/gz-rendering/pull/1093)
217+
218+
### Gazebo Rendering 8.2.1 (2024-11-08)
219+
220+
1. Update code for loading normal and albedo maps from image data
221+
* [Pull request #1068](https://github.com/gazebosim/gz-rendering/pull/1068)
222+
223+
1. Check for zero quaternion value in MoveToHelper
224+
* [Pull request #1076](https://github.com/gazebosim/gz-rendering/pull/1076)
225+
226+
1. Fix waves 'double' to 'float' truncation warning
227+
* [Pull request #1065](https://github.com/gazebosim/gz-rendering/pull/1065)
228+
229+
1. Install Roboto fonts to ogre plugin
230+
* [Pull request #1035](https://github.com/gazebosim/gz-rendering/pull/1035)
231+
232+
1. Fixed integer underflow in OgreDistortionPass
233+
* [Pull request #994](https://github.com/gazebosim/gz-rendering/pull/994)
234+
235+
1. Add gamma correction to simple_demo_qml example
236+
* [Pull request #1019](https://github.com/gazebosim/gz-rendering/pull/1019)
237+
238+
1. Optimization: remove extra copy of data buffer in Ogre2GpuRays and Ogre2DepthCamera
239+
* [Pull request #1022](https://github.com/gazebosim/gz-rendering/pull/1022)
240+
241+
1. Fix crash when wide angle camera FOV is > 180
242+
* [Pull request #1016](https://github.com/gazebosim/gz-rendering/pull/1016)
243+
244+
1. Fix debug builds of gz-rendering-ogre2 plugin
245+
* [Pull request #1014](https://github.com/gazebosim/gz-rendering/pull/1014)
246+
247+
1. Fix lidar 1st pass texture resolution calculation for FOV < 90 degrees
248+
* [Pull request #1012](https://github.com/gazebosim/gz-rendering/pull/1012)
249+
250+
1. Use single cubemap camera in lidar
251+
* [Pull request #1013](https://github.com/gazebosim/gz-rendering/pull/1013)
252+
253+
1. Parse correctly OGRE2_RESOURCE_PATH on Windows
254+
* [Pull request #996](https://github.com/gazebosim/gz-rendering/pull/996)
255+
256+
### Gazebo Rendering 8.2.0 (2024-06-19)
211257

212258
1. Backport: Adding cone primitives.
213259
* [Pull request #1003](https://github.com/gazebosim/gz-rendering/pull/1003)

src/MoveToHelper.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void MoveToHelper::MoveTo(const CameraPtr &_camera,
7474
else
7575
key->Translation(start.Pos());
7676

77-
if (_target.Rot().IsFinite())
77+
if (_target.Rot().IsFinite() && _target.Rot() != math::Quaterniond::Zero)
7878
key->Rotation(_target.Rot());
7979
else
8080
key->Rotation(start.Rot());

test/integration/mesh.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ TEST_F(MeshTest, NormalMapWithoutTexCoord)
4545
#if defined _WIN32
4646
// https://github.com/gazebosim/gz-rendering/issues/1117
4747
CHECK_UNSUPPORTED_ENGINE("ogre");
48+
#elif defined __linux__
49+
// This test fails in ogre on Noble Github Actions.
50+
// Need to investigate further.
51+
std::string githubAction;
52+
if (common::env("GITHUB_ACTIONS", githubAction))
53+
{
54+
CHECK_UNSUPPORTED_ENGINE("ogre");
55+
}
4856
#endif
4957

5058
// Create a mesh with 2 submeshes - one with red texture and the other with

0 commit comments

Comments
 (0)