amaazetools 0.1.7__tar.gz → 0.1.9__tar.gz

{amaazetools-0.1.7/amaazetools.egg-info → amaazetools-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amaazetools
-Version: 0.1.7
+Version: 0.1.9
 Summary: Python package for mesh processing tools developed by AMAAZE
 Author-email: Jeff Calder <jwcalder@umn.edu>
 License: MIT

{amaazetools-0.1.7 → amaazetools-0.1.9}/amaazetools/trimesh.py

@@ -43,14 +43,22 @@ def marching_cubes(volume,level=None,spacing=(1,1,1)):
             points of triangulation
         t : (m,3) int
             triangles of triangulation
+        n : (n,3) float 
+            vertex normals of triangulated surface
+        val : (n) float 
+            isosurface values
     """
 
-    p,t,n,val = measure.marching_cubes(volume,level=level,spacing=spacing)
+    p,t,n,val = measure.marching_cubes(volume,level=level,spacing=spacing,allow_degenerate=False)
 
     #sometimes marching cubes produces... artifacts... so here's a very basic intro to mesh cleaning!
     #first: eliminate repeated points:
+    '''
     p,index,inv = np.unique(p,axis=0, return_index=True,return_inverse=True)
 
+    n = n[index,:]
+    val = val[index]
+
     #next: rid triangulation of non-triangles:
     t = inv[t]
     badt = (t[:,0]==t[:,1])+(t[:,1]==t[:,2])+(t[:,2]==t[:,0])
@@ -60,9 +68,13 @@ def marching_cubes(volume,level=None,spacing=(1,1,1)):
     ind = -1*np.ones(p.shape[0],int)
     uni = np.unique(t.flatten()) #these are already sorted for numpy
     ind[uni] = np.arange(uni.shape[0])
-    p = p[ind>-1,:]
-    t = ind[t]
 
+    L = ind>-1
+    p = p[L,:]
+    n = n[L,:]
+    val = val[L]
+    t = ind[t]
+    '''
     #finally, check right hand rule... this works for ~convex objects, anyway...
     #m = tm.mesh(p,t)
 
@@ -72,7 +84,7 @@ def marching_cubes(volume,level=None,spacing=(1,1,1)):
     #cent = m.points.mean(0)
     #fliporder = np.sum(tn*(tc-cent),1)<0
     #t[fliporder,1:3] = t[fliporder,2:0:-1]
-    return p,t
+    return p,t,n,val
 
 def withiness(x):
     """ Computes withiness (how well 1-D data clusters into two groups).
@@ -582,7 +594,7 @@ class mesh:
         newtri = newtri[ np.sum(newtri<0,1) ==0, :]
         
         newpts = pts[pt_ind2keep,:]
-        return newpts, newtri
+        return mesh(newpts, newtri)
 
     #Returns unit normal vectors to vertices (averaging adjacent faces and normalizing)
     def vertex_normals(self):

{amaazetools-0.1.7 → amaazetools-0.1.9/amaazetools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amaazetools
-Version: 0.1.7
+Version: 0.1.9
 Summary: Python package for mesh processing tools developed by AMAAZE
 Author-email: Jeff Calder <jwcalder@umn.edu>
 License: MIT

{amaazetools-0.1.7 → amaazetools-0.1.9}/pyproject.toml

@@ -9,7 +9,7 @@ packages = ['amaazetools']
 
 [project]
 name = "amaazetools"
-version = "0.1.7"
+version = "0.1.9"
 authors = [
   { name="Jeff Calder", email="jwcalder@umn.edu" },
 ]