From 7cc30bdf08e01027c3bfdcce5fa8d9000c308eda Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Fri, 19 Jun 2026 08:43:15 +0200 Subject: [PATCH 1/5] Update VTK to de9fb55d2f223a0eb3217888a7139132f3bd2ab5 --- .github/workflows/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/versions.json b/.github/workflows/versions.json index 00502d5f52..0d6ecdf221 100644 --- a/.github/workflows/versions.json +++ b/.github/workflows/versions.json @@ -111,8 +111,8 @@ "version": "v1.3.1", "min_version": "v1.2.13" }, - "vtk_commit_sha": "31bcf57f7c6b2b1490f641837f8367a0d8b5277b", - "docker_timestamp": "20260531_0", + "vtk_commit_sha": "de9fb55d2f223a0eb3217888a7139132f3bd2ab5", + "docker_timestamp": "20260625_0", "global_cache_index": "2", "vtk_matrix": "['commit', 'v9.6.2', 'v9.5.2', 'v9.4.2']" } From 04215b445bcba5b5fc7a74435e6812206197f5c3 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Sat, 20 Jun 2026 10:34:54 +0200 Subject: [PATCH 2/5] AxesGrid: Update baselines for new version in VTK --- application/testing/tests.features.cmake | 2 +- application/testing/tests.interaction.cmake | 2 +- testing/baselines/TestAxesGridEnable.png | 4 ++-- testing/baselines/TestAxesGridEnableNonCenteredData.png | 4 ++-- testing/baselines/TestCommandScriptAxesGridAnimation.png | 4 ++-- testing/baselines/TestInteractionAxesGridFileSwitch.png | 4 ++-- testing/baselines/TestInteractionAxesGridToggle.png | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/application/testing/tests.features.cmake b/application/testing/tests.features.cmake index 258eaff793..5d1e5e5fd2 100644 --- a/application/testing/tests.features.cmake +++ b/application/testing/tests.features.cmake @@ -104,7 +104,7 @@ endif() ## Axes grid # Needs https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11209 -if(VTK_VERSION VERSION_GREATER_EQUAL 9.4.20250513) +if(VTK_VERSION VERSION_GREATER_EQUAL 9.6.20260612) f3d_test(NAME TestAxesGridEnable DATA suzanne.ply ARGS --axes-grid THRESHOLD 0.08) # Threshold required for MacOS due to line rendering differences f3d_test(NAME TestAxesGridEnableNonCenteredData DATA cow.vtp ARGS --axes-grid) f3d_test(NAME TestAxesGridEnableSSAA DATA cow.vtp ARGS --axes-grid --anti-aliasing=ssaa) diff --git a/application/testing/tests.interaction.cmake b/application/testing/tests.interaction.cmake index 00342276f9..a427d2d97e 100644 --- a/application/testing/tests.interaction.cmake +++ b/application/testing/tests.interaction.cmake @@ -65,7 +65,7 @@ endif() f3d_test(NAME TestInteractionConfigFileAndCommand DATA multi ARGS -o CONFIG ${F3D_SOURCE_DIR}/testing/configs/complex.json INTERACTION UI LONG_TIMEOUT) #OX;Right;N;Right;Right;Right -if(VTK_VERSION VERSION_GREATER_EQUAL 9.4.20250513) +if(VTK_VERSION VERSION_GREATER_EQUAL 9.6.20260612) f3d_test(NAME TestInteractionAxesGridToggle INTERACTION DATA suzanne.ply THRESHOLD 0.08) #Shift+x f3d_test(NAME TestInteractionAxesGridFileSwitch INTERACTION DATA backface.vtp cow.vtp ARGS --axes-grid THRESHOLD 0.08) #Right endif() diff --git a/testing/baselines/TestAxesGridEnable.png b/testing/baselines/TestAxesGridEnable.png index c72bc4f17c..2073b3feab 100644 --- a/testing/baselines/TestAxesGridEnable.png +++ b/testing/baselines/TestAxesGridEnable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:451dba6fa8d5b1b2a21e01091a8785c443015f4a69c3d39b03e05f384209539c -size 30379 +oid sha256:b90b308c2f2ee4f546e0985f4e348541fc3ddbeb21f628f3edc2311823db9749 +size 29740 diff --git a/testing/baselines/TestAxesGridEnableNonCenteredData.png b/testing/baselines/TestAxesGridEnableNonCenteredData.png index 5ae4161631..d33abdbe52 100644 --- a/testing/baselines/TestAxesGridEnableNonCenteredData.png +++ b/testing/baselines/TestAxesGridEnableNonCenteredData.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:402f815380c2598c73674e6019fa1ec327ff391a24e5c7eec5ad9d2243c62207 -size 22998 +oid sha256:bd45cb5ec18691edc08b746268ea5ef15d312e6e3b08316d1ead87f5a942460a +size 22774 diff --git a/testing/baselines/TestCommandScriptAxesGridAnimation.png b/testing/baselines/TestCommandScriptAxesGridAnimation.png index 15da4a6ad5..8a64ec7295 100644 --- a/testing/baselines/TestCommandScriptAxesGridAnimation.png +++ b/testing/baselines/TestCommandScriptAxesGridAnimation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecee457fc93392670f17dc365dfa081c9f129a00f0a5595a573bad016d06468a -size 4632 +oid sha256:f1f0832a1ff1c70e7d1ae28010b79dbd47287c3cf56f9c7dc7d1a8dd43e1f955 +size 4548 diff --git a/testing/baselines/TestInteractionAxesGridFileSwitch.png b/testing/baselines/TestInteractionAxesGridFileSwitch.png index 5ae4161631..d33abdbe52 100644 --- a/testing/baselines/TestInteractionAxesGridFileSwitch.png +++ b/testing/baselines/TestInteractionAxesGridFileSwitch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:402f815380c2598c73674e6019fa1ec327ff391a24e5c7eec5ad9d2243c62207 -size 22998 +oid sha256:bd45cb5ec18691edc08b746268ea5ef15d312e6e3b08316d1ead87f5a942460a +size 22774 diff --git a/testing/baselines/TestInteractionAxesGridToggle.png b/testing/baselines/TestInteractionAxesGridToggle.png index c72bc4f17c..2073b3feab 100644 --- a/testing/baselines/TestInteractionAxesGridToggle.png +++ b/testing/baselines/TestInteractionAxesGridToggle.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:451dba6fa8d5b1b2a21e01091a8785c443015f4a69c3d39b03e05f384209539c -size 30379 +oid sha256:b90b308c2f2ee4f546e0985f4e348541fc3ddbeb21f628f3edc2311823db9749 +size 29740 From 6c70d3cfbcf6dd37c2fce8c720ed9ea34875d2f1 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Sat, 20 Jun 2026 13:16:21 +0200 Subject: [PATCH 3/5] Update TestSDKTriggerInteractions* baselines --- .../TestSDKTriggerInteractionsCheatSheetKeybindSearch.png | 4 ++-- .../baselines/TestSDKTriggerInteractionsCheatSheetSearch.png | 4 ++-- testing/baselines/TestSDKTriggerInteractionsKeyPress.png | 4 ++-- testing/baselines/TestSDKTriggerInteractionsKeyPressMod.png | 4 ++-- testing/baselines/TestSDKTriggerInteractionsMousePan.png | 4 ++-- testing/baselines/TestSDKTriggerInteractionsMouseRotate.png | 4 ++-- testing/baselines/TestSDKTriggerInteractionsMouseZoom.png | 4 ++-- testing/baselines/TestSDKTriggerInteractionsTextInput.png | 4 ++-- testing/baselines/TestSDKTriggerInteractionsWheelBackward.png | 4 ++-- testing/baselines/TestSDKTriggerInteractionsWheelForward.png | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/testing/baselines/TestSDKTriggerInteractionsCheatSheetKeybindSearch.png b/testing/baselines/TestSDKTriggerInteractionsCheatSheetKeybindSearch.png index 5aef35b242..8a7beaaa56 100644 --- a/testing/baselines/TestSDKTriggerInteractionsCheatSheetKeybindSearch.png +++ b/testing/baselines/TestSDKTriggerInteractionsCheatSheetKeybindSearch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71784ce37edc4862c581b6fc6071e7aaf638897eb94c20e6f0810478356619a5 -size 31548 +oid sha256:319bb4131aaac86c37a11d26fe2f670622bc02b5e4168a7678dc8d2644f7c435 +size 30808 diff --git a/testing/baselines/TestSDKTriggerInteractionsCheatSheetSearch.png b/testing/baselines/TestSDKTriggerInteractionsCheatSheetSearch.png index 6420215f74..08b66e1571 100644 --- a/testing/baselines/TestSDKTriggerInteractionsCheatSheetSearch.png +++ b/testing/baselines/TestSDKTriggerInteractionsCheatSheetSearch.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7aac5ad2776bcb5598c58b75349ddde262871b35ade0d25b5f65849edbf57b1 -size 22566 +oid sha256:d70a6dbd4237dfce0210fd5e6346e9b06a21c0eea81c2fb21056915654590c31 +size 21994 diff --git a/testing/baselines/TestSDKTriggerInteractionsKeyPress.png b/testing/baselines/TestSDKTriggerInteractionsKeyPress.png index 7a2f3034fb..f9f99d7533 100644 --- a/testing/baselines/TestSDKTriggerInteractionsKeyPress.png +++ b/testing/baselines/TestSDKTriggerInteractionsKeyPress.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cd67be44fd72b3b55afdde9510062b9951f96e61ebd681f04ac7673f76bacc2 -size 47054 +oid sha256:b8ecdd85f86cad78372ffad81817dcbc9bfd21cd08f6a9bc944ca36af5ad025b +size 45117 diff --git a/testing/baselines/TestSDKTriggerInteractionsKeyPressMod.png b/testing/baselines/TestSDKTriggerInteractionsKeyPressMod.png index 9b915d2ff8..e0c3cb2258 100644 --- a/testing/baselines/TestSDKTriggerInteractionsKeyPressMod.png +++ b/testing/baselines/TestSDKTriggerInteractionsKeyPressMod.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cb09e6c8b76a0cec625f39c858a8203b0a6c1ab9a06cbd1a19032106a7ce00f -size 16866 +oid sha256:ed4e2cf0b945b087ff679db2dc32357f0175737b4bbecb350e38355c945c8279 +size 16550 diff --git a/testing/baselines/TestSDKTriggerInteractionsMousePan.png b/testing/baselines/TestSDKTriggerInteractionsMousePan.png index 41fb98967a..be7ea907d4 100644 --- a/testing/baselines/TestSDKTriggerInteractionsMousePan.png +++ b/testing/baselines/TestSDKTriggerInteractionsMousePan.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:635642efe13140fb0d6a0245a856df345b45f30c4e8a0df785a1aa828ef7527e -size 17043 +oid sha256:1d6574c624f410e874b1b885b177a59d467a16226b92bdfe737645955f71b9c4 +size 16689 diff --git a/testing/baselines/TestSDKTriggerInteractionsMouseRotate.png b/testing/baselines/TestSDKTriggerInteractionsMouseRotate.png index f866d33774..a6b30cae2d 100644 --- a/testing/baselines/TestSDKTriggerInteractionsMouseRotate.png +++ b/testing/baselines/TestSDKTriggerInteractionsMouseRotate.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f6f7604482429497e881908259d00a0e2f49bbcd4da9e0f76bc3af7c613cce2 -size 14464 +oid sha256:4b10c4c2df05050609f8c2f95e03453d946961f420b4a63a870aec3a62b5ae4f +size 14255 diff --git a/testing/baselines/TestSDKTriggerInteractionsMouseZoom.png b/testing/baselines/TestSDKTriggerInteractionsMouseZoom.png index 7b7d574d7a..c03ee0e7f1 100644 --- a/testing/baselines/TestSDKTriggerInteractionsMouseZoom.png +++ b/testing/baselines/TestSDKTriggerInteractionsMouseZoom.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1c1633258e81684e3acad0b444b0c6e69d1af0cd14a3e4caa45692da14f0fd5 -size 9202 +oid sha256:ee8422d4fbb7b7dc4e6eef1359038a816b4c2cf32c1e31d5180222763f36e7ee +size 8906 diff --git a/testing/baselines/TestSDKTriggerInteractionsTextInput.png b/testing/baselines/TestSDKTriggerInteractionsTextInput.png index b193351347..902dcb39af 100644 --- a/testing/baselines/TestSDKTriggerInteractionsTextInput.png +++ b/testing/baselines/TestSDKTriggerInteractionsTextInput.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c804d02b50492b896d671b02e807bcb26fd6fc1af07e54a63f772cd479239b9e -size 17819 +oid sha256:0a50a4675be4eb91b7899d582ae7379e0961b853a7507d6a29f913523945ffc9 +size 17148 diff --git a/testing/baselines/TestSDKTriggerInteractionsWheelBackward.png b/testing/baselines/TestSDKTriggerInteractionsWheelBackward.png index e647965869..91e5122dcc 100644 --- a/testing/baselines/TestSDKTriggerInteractionsWheelBackward.png +++ b/testing/baselines/TestSDKTriggerInteractionsWheelBackward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a07f3783d09a1425684775ca7f5fb6fca388c9ddeff5137400987a7d6a2d2b45 -size 14920 +oid sha256:2dbe02d94033775e605e562c2f0a6b5141d6e7adb1e3c6497e8a536fad48b6f2 +size 14610 diff --git a/testing/baselines/TestSDKTriggerInteractionsWheelForward.png b/testing/baselines/TestSDKTriggerInteractionsWheelForward.png index 21831b8fad..d8d19c9628 100644 --- a/testing/baselines/TestSDKTriggerInteractionsWheelForward.png +++ b/testing/baselines/TestSDKTriggerInteractionsWheelForward.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cb0eb352a814dea40e66b02e3ac325f7ef79731cc4c6c21fc82221b5fd89a21 -size 22272 +oid sha256:8456ebd7af2aba1dcfafdb4f958a4bdcbca1036307428a0fcbbe8190bc3b4b58 +size 21920 From 126e42855adff331b277ea130cab44ba9651d402 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Thu, 25 Jun 2026 15:43:33 +0200 Subject: [PATCH 4/5] update baselines --- testing/baselines/TestAxesGridEnableSSAA.png | 4 ++-- testing/baselines/TestThumbnailConfigFileWebP.png | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/baselines/TestAxesGridEnableSSAA.png b/testing/baselines/TestAxesGridEnableSSAA.png index a618365ec7..6c31591b3d 100644 --- a/testing/baselines/TestAxesGridEnableSSAA.png +++ b/testing/baselines/TestAxesGridEnableSSAA.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15f9fe48ae0809c43b2b970734c0c278b888f23d412a989f3b3dc274f361543a -size 35378 +oid sha256:92eb9b77418c6cd9b04b8829499577aae40b9a9784cfccc68f3e026e9de48c41 +size 34813 diff --git a/testing/baselines/TestThumbnailConfigFileWebP.png b/testing/baselines/TestThumbnailConfigFileWebP.png index 14e74697b6..1fa3380244 100644 --- a/testing/baselines/TestThumbnailConfigFileWebP.png +++ b/testing/baselines/TestThumbnailConfigFileWebP.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:601ebb740be657d31bc5015786d83f85232a7c91686fb2e01ba441b6f52aa85a -size 81223 +oid sha256:b40f765daf6706d4e2d3cb973000df48d93401cbe8b8746b8ef234c2da4419a2 +size 80601 From 4c4e72b1e65a589a1c3cb8b2638e38fe68025c6c Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Fri, 26 Jun 2026 07:06:54 +0200 Subject: [PATCH 5/5] fixup macos amr --- application/testing/tests.features.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/testing/tests.features.cmake b/application/testing/tests.features.cmake index 5d1e5e5fd2..bbc1452eac 100644 --- a/application/testing/tests.features.cmake +++ b/application/testing/tests.features.cmake @@ -107,7 +107,7 @@ endif() if(VTK_VERSION VERSION_GREATER_EQUAL 9.6.20260612) f3d_test(NAME TestAxesGridEnable DATA suzanne.ply ARGS --axes-grid THRESHOLD 0.08) # Threshold required for MacOS due to line rendering differences f3d_test(NAME TestAxesGridEnableNonCenteredData DATA cow.vtp ARGS --axes-grid) - f3d_test(NAME TestAxesGridEnableSSAA DATA cow.vtp ARGS --axes-grid --anti-aliasing=ssaa) + f3d_test(NAME TestAxesGridEnableSSAA DATA cow.vtp ARGS --axes-grid --anti-aliasing=ssaa THRESHOLD 0.05) f3d_test(NAME TestCommandScriptAxesGridAnimation SCRIPT DATA BoxAnimated.gltf ARGS --axes-grid --camera-zoom-factor=0.2) endif()