qgscamerapose: Do not restrict the pitch angle with qt6

This was introduced as a workaround for a bug in Qt5. It has been fixed in Qt6.
qgis · Nov 25, 2022 · ade4f0c · ade4f0c
1 parent c2bba3b
commit ade4f0c
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 1 deletion.
diff --git a/src/3d/qgscamerapose.cpp b/src/3d/qgscamerapose.cpp
@@ -62,9 +62,13 @@ void QgsCameraPose::setPitchAngle( float pitch )
   // prevent going over the head
   // prevent bug in QgsCameraPose::updateCamera when updating camera rotation.
   // With a mPitchAngle < 0.2 or > 179.8, QQuaternion::fromEulerAngles( mPitchAngle, mHeadingAngle, 0 )
-  // will return bad rotation angle.
+  // will return bad rotation angle in Qt5.
   // See https://bugreports.qt.io/browse/QTBUG-72103
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
   mPitchAngle = std::clamp( pitch, 0.2f, 179.8f );
+#else
+  mPitchAngle = std::clamp( pitch, 0.0f, 180.0f );
+#endif
 }
 
 void QgsCameraPose::updateCamera( Qt3DRender::QCamera *camera )

diff --git a/...ring_1/expected_4978_line_rendering_1.png → ...efault/expected_4978_line_rendering_1.png b/...ring_1/expected_4978_line_rendering_1.png → ...efault/expected_4978_line_rendering_1.png
diff --git a/...1/expected_4978_line_rendering_1_mask.png → ...t/expected_4978_line_rendering_1_mask.png b/...1/expected_4978_line_rendering_1_mask.png → ...t/expected_4978_line_rendering_1_mask.png
diff --git a/...images/3d/expected_4978_line_rendering_1/qt6/expected_4978_line_rendering_1.png b/...images/3d/expected_4978_line_rendering_1/qt6/expected_4978_line_rendering_1.png
diff --git a/...images/3d/expected_billboard_rendering_1/qt6/expected_billboard_rendering_1.png b/...images/3d/expected_billboard_rendering_1/qt6/expected_billboard_rendering_1.png
diff --git a/...s/3d/expected_billboard_rendering_1/qt6/expected_billboard_rendering_1_mask.png b/...s/3d/expected_billboard_rendering_1/qt6/expected_billboard_rendering_1_mask.png
diff --git a/...lat_terrain_1/expected_flat_terrain_1.png → ...ain_1/default/expected_flat_terrain_1.png b/...lat_terrain_1/expected_flat_terrain_1.png → ...ain_1/default/expected_flat_terrain_1.png
diff --git a/...tdata/control_images/3d/expected_flat_terrain_1/qt6/expected_flat_terrain_1.png b/...tdata/control_images/3d/expected_flat_terrain_1/qt6/expected_flat_terrain_1.png
diff --git a/...a/control_images/3d/expected_line_rendering_1/qt6/expected_line_rendering_1.png b/...a/control_images/3d/expected_line_rendering_1/qt6/expected_line_rendering_1.png
diff --git a/..._terrain_theme/expected_terrain_theme.png → ..._theme/default/expected_terrain_theme.png b/..._terrain_theme/expected_terrain_theme.png → ..._theme/default/expected_terrain_theme.png
diff --git a/...estdata/control_images/3d/expected_terrain_theme/qt6/expected_terrain_theme.png b/...estdata/control_images/3d/expected_terrain_theme/qt6/expected_terrain_theme.png