Merge ign-gui6 ➡️ main

[chapulina]

➡️ Forward port

Port ign-gui6 ➡️ main

Branch comparision: main...ign-gui6

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

[chapulina]

I found a couple more renaming places. Do we need to move include/ignition/gui/* to include/gz/gui? Also, are we renaming IgnHelpers.qml to GzHelpers.qml?

Nice catch, I'll look into that soon

[chapulina]

Do we need to move include/ignition/gui/* to include/gz/gui? Also, are we renaming IgnHelpers.qml to GzHelpers.qml?

Ahh I forgot that those were duplicated. Fixed in 593ccb0. I'd like to revisit that eventually and see if we can get away without duplicated files.

[jennuine]

Are these aliases still needed with 593ccb0?:

gz-gui/include/gz/gui/resources.qrc

Lines 30 to 39 in 593ccb0

	<file alias="qml/IgnCard.qml">qml/GzCard.qml</file>
	<file alias="qml/IgnCardSettings.qml">qml/GzCardSettings.qml</file>
	<file alias="qml/IgnHelpers.qml">qml/GzHelpers.qml</file>
	<file alias="qml/IgnRulers.qml">qml/GzRulers.qml</file>
	<file alias="qml/IgnSnackBar.qml">qml/GzSnackBar.qml</file>
	<file alias="qml/IgnSortFilterModel.qml">qml/GzSortFilterModel.qml</file>
	<file alias="qml/IgnSpinBox.qml">qml/GzSpinBox.qml</file>
	<file alias="qml/IgnSplit.qml">qml/GzSplit.qml</file>
	<file alias="IgnSnackBar.qml">qml/GzSnackBar.qml</file>
	<file alias="IgnSpinBox.qml">qml/GzSpinBox.qml</file>

[chapulina]

I can reproduce the HFOV test failure locally, but I haven't figured out how to fix it:

   /github/workspace/test/integration/minimal_scene.cc:158: Failure
  The difference between 60 and camera->HFOV().Degree() is 15.009121067327513, which exceeds 1e-4, where
  60 evaluates to 60,
  camera->HFOV().Degree() evaluates to 75.009121067327513, and
  1e-4 evaluates to 0.0001.

It looks like the aspect ratio is changing in the middle of the test, so the HFOV changes. @AzulRadio @jennuine , any tips?

[jennuine]

Currently, I think there is a bug in gz-rendering. This line here seems to be the source of the issue:

gz-gui/src/plugins/minimal_scene/MinimalScene.cc

Line 321 in 6059daa

this->dataPtr->camera->PreRender();

Looking at camera->HFOV() before the camera->PreRender() call, the HFOV() returns 60 degrees. After camera->PreRender() it returns 75.0091 degrees, which causes the test to fail. I'll take a closer look at gz-rendering tomorrow

PS. This issue doesn't happen on fortress (after I set textureDirty = true to match main)

[chapulina]

Looking at camera->HFOV() before the camera->PreRender() call, the HFOV() returns 60 degrees. After camera->PreRender() it returns 75.0091 degrees

Thanks for the lead, @jennuine ! I believe the issue is that we were setting the aspect ratio every time the texture is dirty, but now that we want to keep a constant FOV, we should be setting that instead. Also since gazebosim/gz-rendering#635 the aspect ratio is updated automatically with the SetImage[Height|Width] calls.

See the fix in c7cac24 and let me know if you're ok with it. The test passes now, and I checked locally that resizing a window behaves correctly.

[jennuine]

See the fix in c7cac24 and let me know if you're ok with it

LGTM!

[jennuine]

Are we still deprecating gz-sim scene3d? If not, we should update it too (and update the deprecated warning version numbers)l: https://github.com/gazebosim/gz-sim/blob/ff101099698da7795fe25f9c03b0bc34a7a25f5e/src/gui/plugins/scene3d/Scene3D.cc#L688-L689

[chapulina]

Are we still deprecating gz-sim scene3d?

Yup, that's being removed in

• 🕐 Tock: Remove Fortress deprecations gz-sim#1605