Enable splats on Android/Wasm (f3d-app#2646)

Author: Meakk

vtkext/private/module/CMakeLists.txt

@@ -33,7 +33,11 @@ if(F3D_MODULE_UI)
   list(APPEND private_headers ${CMAKE_CURRENT_BINARY_DIR}/F3DDefaultLogo.h)
 endif()
 
-set(shader_files glsl/vtkF3DComputeDepthCS.glsl glsl/vtkF3DRandomFS.glsl)
+set(shader_files glsl/vtkF3DRandomFS.glsl)
+
+if (NOT ANDROID AND NOT EMSCRIPTEN)
+  list(APPEND shader_files glsl/vtkF3DComputeDepthCS.glsl)
+endif()
 
 if(F3D_MODULE_UI)
   list(APPEND shader_files glsl/vtkF3DImguiFS.glsl glsl/vtkF3DImguiVS.glsl)
@@ -84,7 +88,7 @@ if (F3D_MODULE_UI)
 endif ()
 
 # Needs https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10675
-if(NOT ANDROID AND NOT EMSCRIPTEN AND VTK_VERSION VERSION_GREATER_EQUAL 9.3.20240203)
+if(VTK_VERSION VERSION_GREATER_EQUAL 9.3.20240203)
   set(classes ${classes} vtkF3DPointSplatMapper)
 endif()
 

vtkext/private/module/vtkF3DObjectFactory.cxx

@@ -4,8 +4,7 @@
 
 #include "vtkF3DPolyDataMapper.h"
 
-#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__) &&                                           \
-  VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 3, 20240203)
+#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 3, 20240203)
 #include <vtkF3DPointSplatMapper.h>
 #endif
 
@@ -39,8 +38,7 @@ vtkF3DObjectFactory::vtkF3DObjectFactory()
   this->RegisterOverride("vtkPolyDataMapper", "vtkF3DPolyDataMapper",
     "vtkPolyDataMapper override for F3D", 1, ::Factory<vtkF3DPolyDataMapper>);
 
-#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__) &&                                           \
-  VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 3, 20240203)
+#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 3, 20240203)
   this->RegisterOverride("vtkPointGaussianMapper", "vtkF3DPointSplatMapper",
     "vtkPointGaussianMapper override for F3D", 1, ::Factory<vtkF3DPointSplatMapper>);
 #endif

vtkext/private/module/vtkF3DPointSplatMapper.cxx

@@ -1,7 +1,9 @@
 #include "vtkF3DPointSplatMapper.h"
 
+#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
 #include "vtkF3DBitonicSort.h"
 #include "vtkF3DComputeDepthCS.h"
+#endif
 #include "vtkF3DRenderer.h"
 
 #include <vtkCamera.h>
@@ -62,6 +64,7 @@ class vtkF3DSplatMapperHelper : public vtkOpenGLPointGaussianMapperHelper
     vtkOpenGLHelper& cellBO, vtkRenderer* ren, vtkActor* actor) override;
 
 private:
+#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
   void SortSplats(vtkRenderer* ren);
 
   vtkNew<vtkShader> DepthComputeShader;
@@ -72,6 +75,7 @@ class vtkF3DSplatMapperHelper : public vtkOpenGLPointGaussianMapperHelper
 
   double DirectionThreshold = 0.999;
   double LastDirection[3] = { 0.0, 0.0, 0.0 };
+#endif
 
   int MaxTextureSize = 0;
   vtkNew<vtkTextureObject> SphericalHarmonicsTexture;
@@ -84,11 +88,13 @@ vtkStandardNewMacro(vtkF3DSplatMapperHelper);
 //----------------------------------------------------------------------------
 vtkF3DSplatMapperHelper::vtkF3DSplatMapperHelper()
 {
+#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
   this->DepthComputeShader->SetType(vtkShader::Compute);
   this->DepthComputeShader->SetSource(vtkF3DComputeDepthCS);
   this->DepthProgram->SetComputeShader(this->DepthComputeShader);
 
   this->Sorter->Initialize(512, VTK_FLOAT, VTK_UNSIGNED_INT);
+#endif
 }
 
 //----------------------------------------------------------------------------
@@ -105,9 +111,11 @@ void vtkF3DSplatMapperHelper::BuildBufferObjects(vtkRenderer* ren, vtkActor* act
 
   vtkOpenGLPointGaussianMapperHelper::BuildBufferObjects(ren, act);
 
+#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
   // allocate a buffer of depths used for sorting splats
   this->DepthBuffer->Allocate(splatCount * sizeof(float), vtkOpenGLBufferObject::ArrayBuffer,
     vtkOpenGLBufferObject::DynamicCopy);
+#endif
 
   this->SphericalHarmonicsDegree = 0;
 
@@ -269,6 +277,7 @@ void vtkF3DSplatMapperHelper::SetCameraShaderParameters(
   this->Superclass::SetCameraShaderParameters(cellBO, ren, actor);
 }
 
+#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
 //----------------------------------------------------------------------------
 void vtkF3DSplatMapperHelper::SortSplats(vtkRenderer* ren)
 {
@@ -319,18 +328,20 @@ void vtkF3DSplatMapperHelper::SortSplats(vtkRenderer* ren)
     }
   }
 }
+#endif
 
 //----------------------------------------------------------------------------
 void vtkF3DSplatMapperHelper::RenderPieceDraw(vtkRenderer* ren, vtkActor* actor)
 {
+#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
   const vtkF3DRenderer* renderer = vtkF3DRenderer::SafeDownCast(ren);
 
   if (renderer->GetBlendingMode() == vtkF3DRenderer::BlendingMode::SORT &&
-    vtkShader::IsComputeShaderSupported() && actor->GetForceTranslucent())
+    vtkShader::IsComputeShaderSupported() && actor->HasTranslucentPolygonalGeometry())
   {
     this->SortSplats(ren);
   }
-
+#endif
   vtkOpenGLPointGaussianMapperHelper::RenderPieceDraw(ren, actor);
 }
 
@@ -342,16 +353,19 @@ void vtkF3DSplatMapperHelper::ReplaceShaderColor(
   {
     std::string VSSource = shaders[vtkShader::Vertex]->GetSource();
 
-    vtkShaderProgram::Substitute(VSSource, "//VTK::Color::Dec",
-      "//VTK::Color::Dec\n\n"
-      "uniform sampler2DArray sphericalHarmonics;\n"
-      "uniform vec3 cameraDirection;\n"
-      "vec3 decode(ivec3 texelIndex)\n"
-      "{\n"
-      "  vec3 texel = texelFetch(sphericalHarmonics, texelIndex, 0).rgb;\n"
-      "  return texel * 2.0 - 1.0;\n"
-      "}\n\n",
-      false);
+    if (this->SphericalHarmonicsDegree > 0)
+    {
+      vtkShaderProgram::Substitute(VSSource, "//VTK::Color::Dec",
+        "//VTK::Color::Dec\n\n"
+        "uniform sampler2DArray sphericalHarmonics;\n"
+        "uniform vec3 cameraDirection;\n"
+        "vec3 decode(ivec3 texelIndex)\n"
+        "{\n"
+        "  vec3 texel = texelFetch(sphericalHarmonics, texelIndex, 0).rgb;\n"
+        "  return texel * 2.0 - 1.0;\n"
+        "}\n\n",
+        false);
+    }
 
     std::stringstream shStr;
     shStr << "//VTK::Color::Impl\n";

vtkext/private/module/vtkF3DPolyDataMapper.h

@@ -1,7 +1,11 @@
 /**
  * @class   vtkF3DPolyDataMapper
- * @brief   Custom surface mapper used to include skinning and morphing for glTF format
+ * @brief   Custom surface mapper used to include F3D features
  *
+ * This mapper is used to add many F3D custom features:
+ * - skinning and morphing capabilities
+ * - support for MatCap rendering
+ * - support for TAA jittering
  */
 
 #ifndef vtkF3DPolyDataMapper_h

vtkext/public/module/CMakeLists.txt

@@ -1,9 +1,13 @@
-set(shader_files
-  glsl/vtkF3DBitonicSortGlobalDisperseCS.glsl
-  glsl/vtkF3DBitonicSortGlobalFlipCS.glsl
-  glsl/vtkF3DBitonicSortLocalDisperseCS.glsl
-  glsl/vtkF3DBitonicSortLocalSortCS.glsl
-  glsl/vtkF3DBitonicSortFunctions.glsl)
+set(shader_files "")
+
+if(NOT ANDROID AND NOT EMSCRIPTEN)
+  set(shader_files ${shader_files}
+    glsl/vtkF3DBitonicSortGlobalDisperseCS.glsl
+    glsl/vtkF3DBitonicSortGlobalFlipCS.glsl
+    glsl/vtkF3DBitonicSortLocalDisperseCS.glsl
+    glsl/vtkF3DBitonicSortLocalSortCS.glsl
+    glsl/vtkF3DBitonicSortFunctions.glsl)
+endif()
 
 foreach(file IN LISTS shader_files)
   vtk_encode_string(