Skip to content

Commit

Permalink
ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Meakk committed Dec 21, 2024
1 parent 6fdc198 commit f3969e8
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/actions/vtk_commit_sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e5226e04401e93dc8aabd83d082cfbb111811c53
d085bfba2e97c65a031daacae3499c051bb8f18b
10 changes: 6 additions & 4 deletions application/testing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,11 @@ if(VTK_VERSION VERSION_GREATER_EQUAL 9.3.20231108)
if(APPLE) # MacOS does not support OpenGL 4.3
f3d_test(NAME TestSkinningManyBonesFailure DATA tube_254bones.glb ARGS --verbose REGEXP "which requires OpenGL" NO_BASELINE)
else()
# Strictly speaking, this test can also fail if ran without OpenGL 4.3 support on Windows and Linux
# Instead of checking MacOS only, we should try to get OpenGL capabilities from CMake later instead
f3d_test(NAME TestSkinningManyBones DATA tube_254bones.glb)
if(VTK_VERSION VERSION_GREATER_EQUAL 9.4.20241219) # The baseline changed with armature support
# Strictly speaking, this test can also fail if ran without OpenGL 4.3 support on Windows and Linux
# Instead of checking MacOS only, we should try to get OpenGL capabilities from CMake later instead
f3d_test(NAME TestSkinningManyBones DATA tube_254bones.glb)
endif()
endif()
else()
f3d_test(NAME TestSkinningManyBonesWarning DATA tube_254bones.glb ARGS --verbose REGEXP "with more than 250 bones \\\(254\\\)" NO_BASELINE)
Expand Down Expand Up @@ -399,7 +401,7 @@ f3d_test(NAME TestVerboseAnimationWrongAnimationTimeLow DATA BoxAnimated.gltf AR

# Armature test
f3d_test(NAME TestGLTFRigNoArmature DATA RiggedFigure.glb ARGS --animation-time=1)
if(VTK_VERSION VERSION_GREATER_EQUAL 9.2.20241219)
if(VTK_VERSION VERSION_GREATER_EQUAL 9.4.20241219)
f3d_test(NAME TestGLTFRigArmature DATA RiggedFigure.glb ARGS --animation-time=1 --armature)
f3d_test(NAME TestGLTFRigArmatureSphereTube DATA RiggedFigure.glb ARGS --animation-time=1 --armature --point-size=20 --line-width=5)
endif()
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f3969e8

Please sign in to comment.