fix vtk version

zippy84 · Jan 9, 2025 · 07af9eb · 07af9eb
1 parent 23f8e5f
commit 07af9eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/testing/test_filter.py b/testing/test_filter.py
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 import sys
-sys.path.extend(['/home/zippy/vtkbool/build/lib/python3.11/site-packages/vtkbool'])
+sys.path.extend(['/home/zippy/vtkbool/build/lib/python3.13/site-packages/vtkbool'])
 
 from collections import defaultdict
 from operator import itemgetter

diff --git a/testing/test_python.py b/testing/test_python.py
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 import sys
-sys.path.extend(['/home/zippy/vtkbool/build/lib/python3.10/site-packages/vtkbool'])
+sys.path.extend(['/home/zippy/vtkbool/build/lib/python3.13/site-packages/vtkbool'])
 
 from vtkmodules.vtkFiltersSources import vtkCubeSource
 from vtkmodules.vtkIOLegacy import vtkPolyDataWriter

diff --git a/vtkPolyDataContactFilter.cxx b/vtkPolyDataContactFilter.cxx
@@ -1197,9 +1197,9 @@ void PreventEqualCaptPoints::Find (vtkPolyData *pd, vtkPolyData *other, [[maybe_
 
             double d;
 
-            bool collapse = false;
+            bool collapse = true;
 
-            for (; itrA != snaps.end()-1 && !collapse; ++itrA) {
+            for (; itrA != snaps.end()-1 && collapse; ++itrA) {
                 for (itrB = itrA+1; itrB < snaps.end(); ++itrB) {
                     d = Point3d::GetDist(itrA->inter, itrB->inter);
 
@@ -1208,13 +1208,13 @@ void PreventEqualCaptPoints::Find (vtkPolyData *pd, vtkPolyData *other, [[maybe_
 #endif
 
                     if (d > 1e-10) {
-                        collapse = true;
+                        collapse = false;
                         break;
                     }
                 }
             }
 
-            if (!collapse) {
+            if (collapse) {
                 continue;
             }
 
@@ -1439,7 +1439,7 @@ void PreventEqualCaptPoints::TriangluteCell (vtkPolyData *pd, vtkIdType cellId,
 
     auto triangles = vtkSmartPointer<vtkIdList>::New();
 
-#if (VTK_MAJOR_VERSION >= 9 && VTK_MINOR_VERSION >= 3)
+#if (VTK_MAJOR_VERSION >= 9 && VTK_MINOR_VERSION > 3)
     if (vtkPoly->TriangulateLocalIds(0, triangles) != 1) {
         throw std::runtime_error("");
     }