fix

Author: Meakk

application/testing/CMakeLists.txt

@@ -1632,8 +1632,6 @@ set_tests_properties(f3d::TestNoFileFileNameTemplate PROPERTIES PASS_REGULAR_EXP
 set_tests_properties(f3d::TestNoFileFileNameTemplate PROPERTIES ENVIRONMENT "CTEST_F3D_NO_DATA_FORCE_RENDER=1")
 
 if(NOT WIN32)
-  f3d_test(NAME TestInvalidCache ENV "HOME=" REGEXP "Could not use default cache directory" NO_BASELINE)
-
   add_test(NAME f3d::TestHOMEOutput COMMAND $<TARGET_FILE:f3d> ${F3D_SOURCE_DIR}/testing/data/suzanne.stl --output=~/Testing/Temporary/TestHOMEOutput.png --resolution=300,300 --no-config)
   set_tests_properties(f3d::TestHOMEOutput PROPERTIES ENVIRONMENT "HOME=${CMAKE_BINARY_DIR}")
   set_tests_properties(f3d::TestHOMEOutput PROPERTIES FIXTURES_SETUP f3d::TestHOMEOutput_FIXTURE)

library/testing/TestSDKEngineExceptions.cxx

@@ -72,12 +72,5 @@ int TestSDKEngineExceptions([[maybe_unused]] int argc, [[maybe_unused]] char* ar
   test.expect<f3d::engine::plugin_exception>("load plugin with invalid long name",
     [&]() { f3d::engine::loadPlugin("/" + std::string(257, 'x') + "/file.ext"); });
 
-#if defined(__linux__) || defined(__FreeBSD__)
-  // Test error handling without "HOME" set
-  unsetenv("HOME");
-  test.expect<f3d::engine::cache_exception>(
-    "Create engine without HOME set", [&]() { std::ignore = f3d::engine::createNone(); });
-#endif
-
   return test.result();
 }

vtkext/private/module/vtkF3DRenderer.cxx

@@ -149,7 +149,6 @@ std::string ComputeFileHash(const std::string& filepath)
   return md5Hash;
 }
 
-#ifndef __EMSCRIPTEN__
 //----------------------------------------------------------------------------
 // Download texture from the GPU to a vtkImageData
 vtkSmartPointer<vtkImageData> SaveTextureToImage(
@@ -174,7 +173,6 @@ vtkSmartPointer<vtkImageData> SaveTextureToImage(
 
   return img;
 }
-#endif
 
 //----------------------------------------------------------------------------
 // TODO : add this function in a utils file for rendering in VTK directly
@@ -1312,16 +1310,17 @@ void vtkF3DRenderer::ConfigureHDRILUT()
       }
       assert(lut->GetTextureObject());
 
-#ifndef __EMSCRIPTEN__
-      vtkSmartPointer<vtkImageData> img = ::SaveTextureToImage(
-        lut->GetTextureObject(), GL_TEXTURE_2D, 0, lut->GetLUTSize(), VTK_UNSIGNED_SHORT);
-      assert(img);
+      if (!this->CachePath.empty())
+      {
+        vtkSmartPointer<vtkImageData> img = ::SaveTextureToImage(
+          lut->GetTextureObject(), GL_TEXTURE_2D, 0, lut->GetLUTSize(), VTK_UNSIGNED_SHORT);
+        assert(img);
 
-      vtkNew<vtkXMLImageDataWriter> writer;
-      writer->SetFileName(lutCachePath.c_str());
-      writer->SetInputData(img);
-      writer->Write();
-#endif
+        vtkNew<vtkXMLImageDataWriter> writer;
+        writer->SetFileName(lutCachePath.c_str());
+        writer->SetInputData(img);
+        writer->Write();
+      }
     }
     this->HasValidHDRILUT = true;
   }
@@ -1356,16 +1355,17 @@ void vtkF3DRenderer::ConfigureHDRISphericalHarmonics()
           vtkTable::SafeDownCast(sh->GetOutputDataObject(0))->GetColumn(0));
       }
 
-#ifndef __EMSCRIPTEN__
-      // Create spherical harmonics cache file
-      vtkNew<vtkTable> table;
-      table->AddColumn(this->SphericalHarmonics);
-
-      vtkNew<vtkXMLTableWriter> writer;
-      writer->SetInputData(table);
-      writer->SetFileName(shCachePath.c_str());
-      writer->Write();
-#endif
+      if (!this->CachePath.empty())
+      {
+        // Create spherical harmonics cache file
+        vtkNew<vtkTable> table;
+        table->AddColumn(this->SphericalHarmonics);
+
+        vtkNew<vtkXMLTableWriter> writer;
+        writer->SetInputData(table);
+        writer->SetFileName(shCachePath.c_str());
+        writer->Write();
+      }
     }
     this->HasValidHDRISH = true;
   }
@@ -1398,30 +1398,31 @@ void vtkF3DRenderer::ConfigureHDRISpecular()
       }
       assert(spec->GetTextureObject());
 
-#ifndef __EMSCRIPTEN__
-      unsigned int nbLevels = spec->GetPrefilterLevels();
-      unsigned int size = spec->GetPrefilterSize();
+      if (!this->CachePath.empty())
+      {
+        unsigned int nbLevels = spec->GetPrefilterLevels();
+        unsigned int size = spec->GetPrefilterSize();
 
-      vtkNew<vtkMultiBlockDataSet> mb;
-      mb->SetNumberOfBlocks(nbLevels);
+        vtkNew<vtkMultiBlockDataSet> mb;
+        mb->SetNumberOfBlocks(nbLevels);
 
-      for (unsigned int i = 0; i < nbLevels; i++)
-      {
-        vtkSmartPointer<vtkImageData> img = ::SaveTextureToImage(
-          spec->GetTextureObject(), GL_TEXTURE_CUBE_MAP_POSITIVE_X, i, size >> i, VTK_FLOAT);
-        assert(img);
-        mb->SetBlock(i, img);
-      }
+        for (unsigned int i = 0; i < nbLevels; i++)
+        {
+          vtkSmartPointer<vtkImageData> img = ::SaveTextureToImage(
+            spec->GetTextureObject(), GL_TEXTURE_CUBE_MAP_POSITIVE_X, i, size >> i, VTK_FLOAT);
+          assert(img);
+          mb->SetBlock(i, img);
+        }
 
-      vtkNew<vtkXMLMultiBlockDataWriter> writer;
-      writer->SetCompressorTypeToNone();
-      writer->SetDataModeToAppended();
-      writer->EncodeAppendedDataOff();
-      writer->SetHeaderTypeToUInt64();
-      writer->SetFileName(specCachePath.c_str());
-      writer->SetInputData(mb);
-      writer->Write();
-#endif
+        vtkNew<vtkXMLMultiBlockDataWriter> writer;
+        writer->SetCompressorTypeToNone();
+        writer->SetDataModeToAppended();
+        writer->EncodeAppendedDataOff();
+        writer->SetHeaderTypeToUInt64();
+        writer->SetFileName(specCachePath.c_str());
+        writer->SetInputData(mb);
+        writer->Write();
+      }
     }
     this->HasValidHDRISpec = true;
   }
@@ -2071,11 +2072,14 @@ void vtkF3DRenderer::CreateCacheDirectory()
 {
   assert(this->HasValidHDRIHash);
 
-  // Cache folder for this HDRI
-  std::string currentCachePath = this->CachePath + "/" + this->HDRIHash;
+  if (!this->CachePath.empty())
+  {
+    // Cache folder for this HDRI
+    std::string currentCachePath = this->CachePath + "/" + this->HDRIHash;
 
-  // Create the folder if it does not exists
-  vtksys::SystemTools::MakeDirectory(currentCachePath);
+    // Create the folder if it does not exists
+    vtksys::SystemTools::MakeDirectory(currentCachePath);
+  }
 }
 
 //----------------------------------------------------------------------------