Fixed material bug in lsWriteVisualization mesh (#98)

* Fixed bug in lsWriteVisualization mesh, where first material does not get correct material id * Add build dependencies in test workflow
ViennaTools · Nov 10, 2023 · 2e14575 · 2e14575
1 parent 678c8a2
commit 2e14575
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml
@@ -35,8 +35,11 @@ jobs:
             -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
             -D VIENNALS_BUILD_TESTS=ON
 
+      - name: Build Dependencies
+        run: cmake --build ./build --target buildDependencies
+
       - name: Build Tests
-        run: cmake --build ./build
+        run: cmake --build ./build --target buildTests
 
       - name: Run Tests
         working-directory: ${{github.workspace}}/build

diff --git a/.github/workflows/macos_test.yml b/.github/workflows/macos_test.yml
@@ -41,8 +41,11 @@ jobs:
             -D OpenMP_CXX_LIB_NAMES="omp" \
             -D OpenMP_omp_LIBRARY="$(brew --prefix libomp)/lib/libomp.a"
 
+      - name: Build Dependencies
+        run: cmake --build ./build --target buildDependencies
+
       - name: Build Tests
-        run: cmake --build ./build
+        run: cmake --build ./build --target buildTests
 
       - name: Run Tests
         working-directory: ${{github.workspace}}/build

diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml
@@ -33,8 +33,11 @@ jobs:
       - name: Configure
         run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DVIENNALS_BUILD_TESTS=ON
 
-      - name: Build
-        run: cmake --build ${{github.workspace}}/build
+      - name: Build Dependencies
+        run: cmake --build ${{github.workspace}}/build --target buildDependencies
+
+      - name: Build Tests
+        run: cmake --build ${{github.workspace}}/build --target buildTests
 
       - name: Add VTK to PATH
         run: echo "${{github.workspace}}\dependencies\Install\vtk_external\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

diff --git a/include/lsWriteVisualizationMesh.hpp b/include/lsWriteVisualizationMesh.hpp
@@ -513,8 +513,9 @@ template <class T, int D> class lsWriteVisualizationMesh {
     }
 #endif
 
+    const bool useMaterialMap = materialMap != nullptr;
     materialMeshes.push_back(clipper->GetOutput());
-    materialIds.push_back(0);
+    materialIds.push_back(useMaterialMap ? materialMap->getMaterialId(0) : 0);
 
 #ifdef LS_TO_VISUALIZATION_DEBUG
     {
@@ -526,7 +527,6 @@ template <class T, int D> class lsWriteVisualizationMesh {
 #endif
 
     unsigned counter = 1;
-    const bool useMaterialMap = materialMap != nullptr;
 
     // now cut large volume mesh with all the smaller ones
     for (typename LevelSetsType::const_reverse_iterator it =