Enable depth peeling in default config (#1102)

f3d-app · Dec 19, 2023 · 6c7b1e0 · 6c7b1e0
1 parent 8f6209e
commit 6c7b1e0
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 7 deletions.
diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
@@ -224,6 +224,7 @@ if(NOT F3D_MACOS_BUNDLE)
   f3d_test(NAME TestDefaultConfigFileTIFF DATA logo.tif CONFIG config_build LONG_TIMEOUT DEFAULT_LIGHTS)
   f3d_test(NAME TestDefaultConfigFilePLY DATA suzanneRGBA.ply CONFIG config_build LONG_TIMEOUT DEFAULT_LIGHTS THRESHOLD 100)
   f3d_test(NAME TestDefaultConfigFileAndCommand DATA suzanne.stl ARGS --up=-Y --camera-direction=-1,0.5,-1 CONFIG config_build LONG_TIMEOUT DEFAULT_LIGHTS)
+  f3d_test(NAME TestDefaultConfigTranslucent DATA red_translucent_monkey.gltf CONFIG config_build LONG_TIMEOUT DEFAULT_LIGHTS)
 
   # no-background test needs https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8501
   if(VTK_VERSION VERSION_GREATER_EQUAL 9.1.20211007)

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -7,6 +7,8 @@ For F3D users:
  - Changed `--no-render` behavior so that it doesn't impact verbosity anymore
  - Deprecated `--quiet`, use `--verbose=quiet` instead.
  - Reading EXR files is now multi-threaded and much faster.
+ - Translucency support is now enabled by default.
+ - A small margin is added between the model and the grid to avoid potential z-fighting.
 
 For libf3d users:
  - Added `scene.animation.autoplay` option.

diff --git a/library/VTKExtensions/Rendering/vtkF3DRenderer.cxx b/library/VTKExtensions/Rendering/vtkF3DRenderer.cxx
@@ -498,7 +498,10 @@ void vtkF3DRenderer::ConfigureGridUsingCurrentActors()
       {
         for (int i = 0; i < 3; i++)
         {
-          double size = bounds[2 * i + 1] - bounds[2 * i];
+          // a small margin is added to the size to avoid z-fighting if large translucent
+          // triangles are exactly aligned with the grid bounds
+          constexpr double margin = 1.0001;
+          double size = margin * (bounds[2 * i + 1] - bounds[2 * i]);
           gridPos[i] = 0.5 * (bounds[2 * i] + bounds[2 * i + 1] - this->UpVector[i] * size);
         }
       }

diff --git a/resources/configs/config.d/10_global.json b/resources/configs/config.d/10_global.json
@@ -9,6 +9,7 @@
     "filename": true,
     "scalars": "",
     "camera-direction": "-1,-0.5,-1",
-    "hdri-ambient": true
+    "hdri-ambient": true,
+    "translucency-support": true
   }
 }
diff --git a/resources/configs/thumbnail.d/10_global.json b/resources/configs/thumbnail.d/10_global.json
@@ -8,6 +8,7 @@
     "no-background": true,
     "quiet": true,
     "scalars": "",
-    "tone-mapping": true
+    "tone-mapping": true,
+    "translucency-support": true
   }
 }
diff --git a/testing/baselines/TestDefaultConfigFileAssimpFBX.png b/testing/baselines/TestDefaultConfigFileAssimpFBX.png
diff --git a/testing/baselines/TestDefaultConfigTranslucent.png b/testing/baselines/TestDefaultConfigTranslucent.png
diff --git a/testing/baselines/TestThumbnailConfigFileAssimpFBX.png b/testing/baselines/TestThumbnailConfigFileAssimpFBX.png
diff --git a/testing/data/red_translucent_monkey.bin b/testing/data/red_translucent_monkey.bin
diff --git a/testing/data/red_translucent_monkey.gltf b/testing/data/red_translucent_monkey.gltf