Merge pull request #1904 from mwestphal/fix_armature

- Fix an issue with armature showing up outside of model - Fix an issue with armature not visible with opacity - Change default config for better armature rendering - Add tests
f3d-app · Jan 11, 2025 · deac8e0 · deac8e0
2 parents a79a648 + 8d04b92
commit deac8e0
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 12 deletions.
diff --git a/.github/baselines/install_example_plugin_output.png b/.github/baselines/install_example_plugin_output.png
diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
@@ -373,6 +373,10 @@ if(NOT F3D_MACOS_BUNDLE)
   f3d_test(NAME TestDefaultConfigFileAndCommand DATA suzanne.stl ARGS --up=-Y --camera-direction=-1,0.5,-1 CONFIG config_build LONG_TIMEOUT TONE_MAPPING UI)
   f3d_test(NAME TestDefaultConfigTranslucent DATA red_translucent_monkey.gltf CONFIG config_build LONG_TIMEOUT TONE_MAPPING UI)
 
+if(VTK_VERSION VERSION_GREATER_EQUAL 9.4.20241219)
+  f3d_test(NAME TestDefaultConfigFileArmature DATA RiggedFigure.glb ARGS --animation-time=1 --armature CONFIG config_build LONG_TIMEOUT TONE_MAPPING UI)
+endif()
+
   file(COPY "${F3D_SOURCE_DIR}/resources/configs/thumbnail.d/" "${F3D_SOURCE_DIR}/plugins/native/configs/thumbnail.d/" DESTINATION "${CMAKE_BINARY_DIR}/share/f3d/configs/thumbnail_build.d")
   f3d_test(NAME TestThumbnailConfigFileVTU DATA dragon.vtu CONFIG thumbnail_build LONG_TIMEOUT TONE_MAPPING)
   f3d_test(NAME TestThumbnailConfigFileVTI DATA vase_4comp.vti CONFIG thumbnail_build LONG_TIMEOUT TONE_MAPPING)
@@ -417,9 +421,10 @@ f3d_test(NAME TestVerboseAnimationWrongAnimationTimeHigh DATA BoxAnimated.gltf A
 f3d_test(NAME TestVerboseAnimationWrongAnimationTimeLow DATA BoxAnimated.gltf ARGS --animation-time=-5 --verbose REGEXP "Animation time -5 is outside of range \\[0, 3\\.70833\\], using 0" NO_BASELINE)
 
 # Armature test
-f3d_test(NAME TestGLTFRigNoArmature DATA RiggedFigure.glb ARGS --animation-time=1)
+f3d_test(NAME TestGLTFRigArmatureNoArmature DATA RiggedFigure.glb ARGS --animation-time=1 --opacity=0.5 -p)
 if(VTK_VERSION VERSION_GREATER_EQUAL 9.4.20241219)
   f3d_test(NAME TestGLTFRigArmature DATA RiggedFigure.glb ARGS --animation-time=1 --armature)
+  f3d_test(NAME TestGLTFRigArmatureWithOpacity DATA RiggedFigure.glb ARGS --animation-time=1 --armature --opacity=0.5 -p)
   f3d_test(NAME TestGLTFRigArmatureSphereTube DATA RiggedFigure.glb ARGS --animation-time=1 --armature --point-size=20 --line-width=5)
 endif()
 

diff --git a/doc/user/QUICKSTART.md b/doc/user/QUICKSTART.md
@@ -58,7 +58,7 @@ For **default scene** formats, certain default values are set automatically:
  - roughness: 0.3
  - camera-orthographic: false
 
-They will be overridden when using corresponding [options](OPTIONS.md).
+They will be overridden when using corresponding [options](OPTIONS.md), either from command line or [configuration file](CONFIGURATION_FILE.md).
 
 ## Interacting with your scene
 

diff --git a/resources/configs/config.d/05_all.json b/resources/configs/config.d/05_all.json
@@ -11,7 +11,9 @@
     "camera-direction": "-1,-0.5,-1",
     "hdri-ambient": true,
     "translucency-support": true,
-    "animation-progress": true
+    "animation-progress": true,
+    "point-size": 5,
+    "line-width": 2
   }
 }
 ]
diff --git a/testing/baselines/TestDefaultConfigFileArmature.png b/testing/baselines/TestDefaultConfigFileArmature.png
diff --git a/testing/baselines/TestGLTFRigArmatureNoArmature.png b/testing/baselines/TestGLTFRigArmatureNoArmature.png
diff --git a/testing/baselines/TestGLTFRigArmatureWithOpacity.png b/testing/baselines/TestGLTFRigArmatureWithOpacity.png
diff --git a/testing/baselines/TestGLTFRigNoArmature.png b/testing/baselines/TestGLTFRigNoArmature.png
diff --git a/vtkext/private/module/vtkF3DRenderPass.cxx b/vtkext/private/module/vtkF3DRenderPass.cxx
@@ -100,9 +100,12 @@ void vtkF3DRenderPass::Initialize(const vtkRenderState* s)
     {
       // armature
       vtkInformation* info = prop->GetPropertyKeys();
-      if (this->ArmatureVisible && info && info->Has(vtkF3DImporter::ACTOR_IS_ARMATURE()))
+      if (info && info->Has(vtkF3DImporter::ACTOR_IS_ARMATURE()))
       {
-        this->MainOnTopProps.push_back(prop);
+        if (this->ArmatureVisible)
+        {
+          this->MainOnTopProps.push_back(prop);
+        }
       }
       else
       {

diff --git a/vtkext/private/module/vtkF3DRenderer.cxx b/vtkext/private/module/vtkF3DRenderer.cxx
@@ -1840,8 +1840,12 @@ void vtkF3DRenderer::ConfigureActorsProperties()
 
     if (this->Opacity.has_value())
     {
-      actor->GetProperty()->SetOpacity(this->Opacity.value());
-      originalActor->GetProperty()->SetOpacity(this->Opacity.value());
+      vtkInformation* info = originalActor->GetPropertyKeys();
+      if (!info || !info->Has(vtkF3DImporter::ACTOR_IS_ARMATURE()))
+      {
+        actor->GetProperty()->SetOpacity(this->Opacity.value());
+        originalActor->GetProperty()->SetOpacity(this->Opacity.value());
+      }
     }
 
     if (this->Roughness.has_value())