diff --git a/application/F3DOptionsTools.h b/application/F3DOptionsTools.h index 3fa03b569e..095dfbc0f2 100644 --- a/application/F3DOptionsTools.h +++ b/application/F3DOptionsTools.h @@ -52,7 +52,7 @@ static inline const OptionsDict DefaultAppOptions = { { "camera-azimuth-angle", "0.0" }, { "camera-elevation-angle", "0.0" }, { "ref", "" }, - { "ref-threshold", "0.05" }, + { "ref-threshold", "0.04" }, { "interaction-test-record", "" }, { "interaction-test-play", "" }, { "command-script", "" }, diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt index 94f1ced6c0..51a6e2b18a 100644 --- a/application/testing/CMakeLists.txt +++ b/application/testing/CMakeLists.txt @@ -191,7 +191,7 @@ f3d_test(NAME TestCameraOrthographic ARGS --camera-orthographic DATA cow.vtp) f3d_test(NAME TestToneMapping DATA suzanne.ply ARGS -t TONE_MAPPING) f3d_test(NAME TestDepthPeelingToneMapping DATA suzanne.ply ARGS --opacity=0.9 -pt TONE_MAPPING) f3d_test(NAME TestVolume DATA HeadMRVolume.mhd ARGS -v --camera-position=127.5,-400,127.5 --camera-view-up=0,0,1) -f3d_test(NAME TestVolumeInverse DATA HeadMRVolume.mhd ARGS -vi --camera-position=127.5,-400,127.5 --camera-view-up=0,0,1) +f3d_test(NAME TestVolumeInverse DATA HeadMRVolume.mhd ARGS -vi --camera-position=127.5,-400,127.5 --camera-view-up=0,0,1 THRESHOLD 0.05) # Small rendering differences due to volume rendering f3d_test(NAME TestVolumeMag DATA vase_4comp.vti ARGS -vb) f3d_test(NAME TestVolumeComp DATA vase_4comp.vti ARGS -vb --coloring-component=3 LONG_TIMEOUT) f3d_test(NAME TestVolumeDirect DATA vase_4comp.vti ARGS -vb --coloring-component=-2) @@ -407,8 +407,8 @@ if(F3D_MODULE_RAYTRACING) f3d_test(NAME TestInteractionCheatsheetBlackBGRaytracing DATA cow.vtp ARGS --background-color=0,0,0 INTERACTION UI) #H f3d_test(NAME TestInteractionCheatsheetScalarsRaytracing DATA dragon.vtu ARGS --scalar-coloring --coloring-component=-2 RESOLUTION 800,800 INTERACTION UI LONG_TIMEOUT) #HSSS f3d_test(NAME TestInteractionCheatsheetNoFileRaytracing INTERACTION UI NO_DATA_FORCE_RENDER) #HXM - f3d_test(NAME TestInteractionCheatsheetAnimationNameRaytracing DATA InterpolationTest.glb ARGS --animation-index=6 RESOLUTION 800,800 INTERACTION UI) #HWWW - f3d_test(NAME TestInteractionCheatsheetConfigFileRaytracing DATA dragon.vtu CONFIG ${F3D_SOURCE_DIR}/testing/configs/bindings.json RESOLUTION 600,1300 INTERACTION UI) #H + f3d_test(NAME TestInteractionCheatsheetAnimationNameRaytracing DATA InterpolationTest.glb ARGS --animation-index=6 RESOLUTION 800,800 INTERACTION UI THRESHOLD 0.05)#HWWW #Threshold is needed for legacy comparison method for VTK 9.3 + f3d_test(NAME TestInteractionCheatsheetConfigFileRaytracing DATA dragon.vtu CONFIG ${F3D_SOURCE_DIR}/testing/configs/bindings.json RESOLUTION 600,1300 INTERACTION UI THRESHOLD 0.05) #H #Threshold is needed for legacy comparison method for VTK 9.3 else() f3d_test(NAME TestInteractionCheatsheet DATA cow.vtp INTERACTION UI) #H f3d_test(NAME TestInteractionCheatsheetWhiteBG DATA cow.vtp ARGS --background-color=1,1,1 INTERACTION UI) #H @@ -455,7 +455,7 @@ if(VTK_VERSION VERSION_GREATER_EQUAL 9.2.20221220) f3d_test(NAME TestHDRI8Bit DATA suzanne.ply HDRI f3d.tif ARGS --color=1.0,0.0,0.0) f3d_test(NAME TestHDRIOrient DATA suzanne.stl HDRI palermo_park_1k.hdr ARGS --up=+Z) f3d_test(NAME TestHDRIToneMapping DATA suzanne.ply HDRI palermo_park_1k.hdr TONE_MAPPING ARGS -t) - f3d_test(NAME TestInteractionHDRIMove DATA suzanne.ply HDRI palermo_park_1k.hdr INTERACTION) #Shift+MouseRight; + f3d_test(NAME TestInteractionHDRIMove DATA suzanne.ply HDRI palermo_park_1k.hdr INTERACTION THRESHOLD 0.05) #Shift+MouseRight; # Threshold is needed for legacy image comparison for VTK 9.3 f3d_test(NAME TestInteractionHDRIBlur DATA suzanne.ply HDRI palermo_park_1k.hdr INTERACTION) #U f3d_test(NAME TestInteractionHDRIReload DATA suzanne.ply HDRI palermo_park_1k.hdr INTERACTION) #Up f3d_test(NAME TestInteractionHDRIChange DATA multi HDRI palermo_park_1k.hdr CONFIG ${F3D_SOURCE_DIR}/testing/configs/complex.json INTERACTION) #Left @@ -517,7 +517,7 @@ endif() if(F3D_MODULE_RAYTRACING) f3d_test(NAME TestRaytracingGLTF DATA WaterBottle.glb ARGS -rd --samples=4) - f3d_test(NAME TestRaytracingBackground DATA suzanne.ply ARGS -rd --samples=4 --background-color=1,0,0) + f3d_test(NAME TestRaytracingBackground DATA suzanne.ply ARGS -rd --samples=4 --background-color=1,0,0 THRESHOLD 0.05) # Threshold needed because of difference in rendering in VTK 9.3 f3d_test(NAME TestRaytracingPointCloud DATA pointsCloud.vtp ARGS -rd --samples=4 --point-size=20 THRESHOLD 0.1) # Threshold needed because of difference in rendering in VTK 9.3 f3d_test(NAME TestRaytracingDenoise DATA suzanne.ply ARGS -rd --samples=4) f3d_test(NAME TestRaytracingNoDenoise DATA suzanne.ply ARGS -r --samples=20) @@ -767,7 +767,7 @@ f3d_test(NAME TestInteractionCycleScalars DATA dragon.vtu INTERACTION) #BSSSS f3d_test(NAME TestInteractionCycleCellInvalidIndex DATA waveletArrays.vti INTERACTION) #SSC f3d_test(NAME TestInteractionVolumeCycle DATA waveletArrays.vti ARGS INTERACTION) #VSS f3d_test(NAME TestInteractionVolumeAfterColoring DATA waveletArrays.vti ARGS INTERACTION) #SSSV -f3d_test(NAME TestInteractionVolumeInverse DATA HeadMRVolume.mhd ARGS --camera-position=127.5,-400,127.5 --camera-view-up=0,0,1 INTERACTION) #VI +f3d_test(NAME TestInteractionVolumeInverse DATA HeadMRVolume.mhd ARGS --camera-position=127.5,-400,127.5 --camera-view-up=0,0,1 INTERACTION THRESHOLD 0.05)#VI #Small rendering differences due to volume rendering f3d_test(NAME TestInteractionMultiFileVolume DATA multi ARGS --multi-file-mode=all INTERACTION) #SSVB f3d_test(NAME TestInteractionPointCloud DATA pointsCloud.vtp ARGS --point-sprites-size=20 INTERACTION) #O f3d_test(NAME TestInteractionDirectory DATA mb INTERACTION ARGS --scalar-coloring UI) #Right;Right;Right;Left;Up; @@ -789,7 +789,7 @@ f3d_test(NAME TestInteractionEmptyDrop INTERACTION REGEXP "Drop event without an f3d_test(NAME TestInteractionCameraUpdate DATA dragon.vtu INTERACTION) #MouseWheel;MouseWheel;MouseWheel;S f3d_test(NAME TestInteractionFocalPointPickingDefault DATA dragon.vtu INTERACTION LONG_TIMEOUT) f3d_test(NAME TestInteractionFocalPointPickingShift DATA dragon.vtu INTERACTION LONG_TIMEOUT) -f3d_test(NAME TestInteractionFocalPointPickingPoints DATA pointsCloud.vtp INTERACTION) +f3d_test(NAME TestInteractionFocalPointPickingPoints DATA pointsCloud.vtp INTERACTION THRESHOLD 0.05) # Threshold needed because sometime a point does not appear f3d_test(NAME TestInteractionLightIntensity DATA dragon.vtu INTERACTION LONG_TIMEOUT) f3d_test(NAME TestInteractionMultiFileColoring DATA mb/recursive ARGS --multi-file-mode=all INTERACTION UI) #SSSB f3d_test(NAME TestInteractionReload DATA dragon.vtu ARGS -e INTERACTION) #Up; diff --git a/doc/user/OPTIONS.md b/doc/user/OPTIONS.md index 11a0b6c574..7dc9788579 100644 --- a/doc/user/OPTIONS.md +++ b/doc/user/OPTIONS.md @@ -138,7 +138,7 @@ Options|Description Options|Default|Description ------|------|------ \-\-ref=\||Render and compare with the provided *reference image*, for testing purposes. Use with output option to generate new baselines and diff images. -\-\-ref-threshold=\|0.05|Set the *comparison threshold* to trigger a test failure or success. The default (0.05) correspond to almost visually identical images. +\-\-ref-threshold=\|0.04|Set the *comparison threshold* to trigger a test failure or success. The default (0.04) correspond to almost visually identical images. \-\-interaction-test-record=\||Path to an interaction log file to *record interaction events* to. \-\-interaction-test-play=\||Path to an interaction log file to *play interactions events* from when loading a file. diff --git a/library/public/image.h b/library/public/image.h index 7f99c28456..faa2930873 100644 --- a/library/public/image.h +++ b/library/public/image.h @@ -146,7 +146,7 @@ class F3D_EXPORT image * Depending on the VTK version, another comparison algorithm may be used. * Threshold should be in range [0, 1[, this returns false otherwise. * 1e-14: Pixel perfect comparison. - * 0.05: Visually indistinguishable. + * 0.04: Visually indistinguishable. * 0.1: Small visible difference. * 0.5: Comparable images. * 1.0: Different type, size or number of components diff --git a/testing/baselines/TestGridOptions.png b/testing/baselines/TestGridOptions.png index 803dffeee3..fa0e282f8a 100644 --- a/testing/baselines/TestGridOptions.png +++ b/testing/baselines/TestGridOptions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc61c8b8ef23681d0c2a5f775e0fb028a13354c79d974564def5cfa5c75fbd7c -size 27988 +oid sha256:545c5a648f763876deefb71c3301a710425dd1589f6456c43797785012899f8f +size 27452 diff --git a/testing/baselines/TestInteractionCheatsheetNoFile.png b/testing/baselines/TestInteractionCheatsheetNoFile.png index 2667021627..9cfbd614a6 100644 --- a/testing/baselines/TestInteractionCheatsheetNoFile.png +++ b/testing/baselines/TestInteractionCheatsheetNoFile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:960224bd1b18ed37717b17242cf57e5fcdea34310f2d8436e931d3454d79bff0 -size 42892 +oid sha256:c955b6de4772273d74cf18c354f718647dc5abc535ce475658b0ed609d9f5345 +size 43215 diff --git a/testing/baselines/TestVolumeCells.png b/testing/baselines/TestVolumeCells.png index bfe66e5b76..cca577d460 100644 --- a/testing/baselines/TestVolumeCells.png +++ b/testing/baselines/TestVolumeCells.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:177eb37ab5a4e216971a6916c01fee9402d18c9f4b04c94e7c94285176000827 -size 27176 +oid sha256:979a53a8020cc6aa0aea0d8e4c5be01324f58ba8c523b5ae8aef64c18b25e915 +size 27158