Small improvements to...

remeshTriangleMesh, tetrahedralizeTriangleMesh, vtkStreamTracer

Author: Steffen Schuler

MATLAB/remeshTriangleMesh.m

@@ -1,15 +1,22 @@
-function vtk = remeshTriangleMesh(vtk, numPoints, creaseAngle)
+function vtk = remeshTriangleMesh(vtk, numPoints, extraFlags)
 
-if nargin < 3
-    creaseAngle = [];
+if nargin < 3 || isempty(extraFlags)
+    extraFlags = '';
+end
+if ~isempty(numPoints)
+    extraFlags = sprintf('%s -v %i', extraFlags, round(numPoints));
 end
 
 % make sure the source mesh contains at least 4 times as many triangles as
 % the target mesh (needed for good results with Instant Meshes)
 numPointsSource = size(vtk.cells,1);
 numSubdiv = max(1-floor(log(numPointsSource/numPoints)/log(4)),0);
 if numSubdiv
-    vtk = vtkLinearSubdivisionFilter(vtk, numSubdiv);
+    try
+        vtk = vtkLinearSubdivisionFilter(vtk, numSubdiv);
+    catch
+        warning('Skipping subdivision before remeshing.');
+    end
 end
 
 tmpfile = [tempname '.ply'];
@@ -21,17 +28,14 @@
     instantmeshes = '/Applications/Instant Meshes.app/Contents/MacOS/Instant Meshes';
 end
 if ~exist(instantmeshes, 'file')
-    instantmeshes = '/Volumes/ServerApps/Instant Meshes.app/Contents/MacOS/Instant Meshes';
+    instantmeshes = '/Users/ss029/Applications/Instant Meshes.app/Contents/MacOS/Instant Meshes';
+%     instantmeshes = '/Volumes/ServerApps/Instant Meshes.app/Contents/MacOS/Instant Meshes';
 end
 if ~exist(instantmeshes, 'file')
     error('Instant Meshes could not be found.');
 end
 
-if isempty(creaseAngle)
-    system(sprintf('''%s'' %s -v %i -o %s -r 6 -p 6 -S 0 -d', instantmeshes, tmpfile, round(numPoints), tmpfile));
-else
-    system(sprintf('''%s'' %s -v %i -o %s -r 6 -p 6 -S 0 -d -c %.1f', instantmeshes, tmpfile, round(numPoints), tmpfile, creaseAngle));
-end
+system(sprintf('''%s'' %s -o %s -r 6 -p 6 -S 0 -d %s', instantmeshes, tmpfile, tmpfile, extraFlags));
 
 vtk = vtkRead(tmpfile);
 delete(tmpfile);

MATLAB/tetrahedralizeTriangleMesh.m

@@ -4,7 +4,7 @@
     optimizeNetgen = false;
 end
 if nargin < 3 || isempty(optimizeThreshold)
-    optimizeThreshold = 0.3;
+    optimizeThreshold = 1;
 end
 if nargin < 2 || isempty(relativeEdgeLength)
     relativeEdgeLength = 1;

MATLAB/tetrahedralizeTriangleMesh_twoSurfaces.m

@@ -1,9 +1,12 @@
-function vtk_vol = tetrahedralizeTriangleMesh_twoSurfaces(vtk_inner_sur, vtk_outer_sur, relativeEdgeLength, optimizeThreshold)
+function vtk_vol = tetrahedralizeTriangleMesh_twoSurfaces(vtk_inner_sur, vtk_outer_sur, relativeEdgeLength, optimizeThreshold, optimizeNetgen)
 
-if nargin < 4
-    optimizeThreshold = 0.3;
+if nargin < 5
+    optimizeNetgen = false;
 end
-if nargin < 3
+if nargin < 4 || isempty(optimizeThreshold)
+    optimizeThreshold = 1;
+end
+if nargin < 3 || isempty(relativeEdgeLength)
     relativeEdgeLength = 1;
 end
 
@@ -25,11 +28,20 @@
 gmsh = 'gmsh';
 [noAliasFound,~] = system(sprintf('which %s', gmsh));
 if noAliasFound
+    gmsh = '/Applications/Gmsh.app/Contents/MacOS/gmsh';
+end
+if ~exist(gmsh, 'file')
     gmsh = '/Volumes/ServerApps/Gmsh.app/Contents/MacOS/gmsh';
 end
+if ~exist(gmsh, 'file')
+    error('Gmsh could not be found.');
+end
 
-system(sprintf('%s %s -3 -order 1 -format vtk -v 4 -clmax %.3f -optimize_threshold %.3f', gmsh, geofile, clmax, optimizeThreshold));
-% system(sprintf('%s %s -3 -order 1 -format vtk -v 4 -clmax %.3f -optimize_netgen -optimize_threshold %.3f', gmsh, geofile, clmax, optimizeThreshold));
+if optimizeNetgen
+    system(sprintf('%s %s -3 -order 1 -format vtk -v 4 -clmax %.3f -optimize_netgen -optimize_threshold %.3f', gmsh, geofile, clmax, optimizeThreshold));
+else
+    system(sprintf('%s %s -3 -order 1 -format vtk -v 4 -clmax %.3f -optimize_threshold %.3f', gmsh, geofile, clmax, optimizeThreshold));
+end
 
 vtkfile = [tmpdir '/' geoname '.vtk'];
 vtk_vol = vtkRead(vtkfile);

vtkStreamTracer/vtkStreamTracer.cxx

@@ -49,8 +49,6 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
 
     ///// Apply vtkGradientFilter and vtkStreamTracer /////
 
-    if(pointSet1->GetDataObjectType() == VTK_POLY_DATA)
-        mexErrMsgTxt("vtkStreamTracer requires an unstructured grid as first input.");
     if(pointSet2->GetDataObjectType() != VTK_POLY_DATA)
         mexErrMsgTxt("vtkStreamTracer requires poly data as second input. Incompatible cell(s) found.");