diff --git a/.gitignore b/.gitignore index e708e040..280ef623 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +.idea checkpoints/* +__pycache__/ +results/ diff --git a/lib/mesh_util.py b/lib/mesh_util.py index 39934219..460ba043 100755 --- a/lib/mesh_util.py +++ b/lib/mesh_util.py @@ -42,7 +42,7 @@ def eval_func(points): # Finally we do marching cubes try: - verts, faces, normals, values = measure.marching_cubes_lewiner(sdf, 0.5) + verts, faces, normals, values = measure.marching_cubes(sdf, 0.5) # transform verts into world coordinate system verts = np.matmul(mat[:3, :3], verts.T) + mat[:3, 3:4] verts = verts.T diff --git a/lib/sdf.py b/lib/sdf.py index e87e639e..e13a8f48 100755 --- a/lib/sdf.py +++ b/lib/sdf.py @@ -55,8 +55,8 @@ def eval_grid_octree(coords, eval_func, sdf = np.zeros(resolution) - dirty = np.ones(resolution, dtype=np.bool) - grid_mask = np.zeros(resolution, dtype=np.bool) + dirty = np.ones(resolution, dtype=bool) + grid_mask = np.zeros(resolution, dtype=bool) reso = resolution[0] // init_resolution diff --git a/requirements.txt b/requirements.txt index e9c086c1..f067eb22 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ PyOpenGL==3.1.5 pyparsing==2.4.6 python-dateutil==2.8.1 PyWavelets==1.1.1 -scikit-image==0.16.2 +scikit-image==0.22.0 scipy==1.4.1 Shapely==1.7.0 six==1.14.0