3d-base 0.3.2__tar.gz → 0.3.3__tar.gz

{3d_base-0.3.2/src/3d_base.egg-info → 3d_base-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: 3d-base
-Version: 0.3.2
+Version: 0.3.3
 Summary: Headless pictures of 3D meshes with correct occlusion and smooth shading, and a health check for exported STL files
 Author: Konstantinos Georgiou
 License-Expression: MIT

{3d_base-0.3.2 → 3d_base-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "3d-base"
-version = "0.3.2"
+version = "0.3.3"
 description = "Headless pictures of 3D meshes with correct occlusion and smooth shading, and a health check for exported STL files"
 readme = "README.md"
 requires-python = ">=3.9"

{3d_base-0.3.2 → 3d_base-0.3.3/src/3d_base.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: 3d-base
-Version: 0.3.2
+Version: 0.3.3
 Summary: Headless pictures of 3D meshes with correct occlusion and smooth shading, and a health check for exported STL files
 Author: Konstantinos Georgiou
 License-Expression: MIT

{3d_base-0.3.2 → 3d_base-0.3.3}/src/base3d/mesh.py

@@ -188,7 +188,7 @@ def as_written(mesh: trimesh.Trimesh, file_type: str = "stl", loose_mm3: float =
             "touches": touches, "loose_mm3": float(loose)}
 
 
-def solid_from_skin(mesh: trimesh.Trimesh, centre, lean: float = 0.3, keep=None) -> trimesh.Trimesh:
+def solid_from_skin(mesh: trimesh.Trimesh, centre, lean: float = 0.3, keep=None, skin: float = 0.5) -> trimesh.Trimesh:
     """A hollow part made solid from its outer skin, by removing its inner surface.
 
     The inner surface is the largest connected region, by area, of faces that point toward `centre`
@@ -200,6 +200,11 @@ def solid_from_skin(mesh: trimesh.Trimesh, centre, lean: float = 0.3, keep=None)
     the same outside and no inside, so a cavity cut into it afterwards (a bore for a part it sits on)
     is the only inside it has.
 
+    A face is hidden only by a face more than `skin` nearer the centre along its ray. Nearer than
+    that is a fold or a second copy of the surface, the kind a boolean or a vertex displacement
+    leaves (a cap's seams, pressed in by half a millimetre, folded its inner skin over itself at
+    the front and hid a patch of it), not a wall.
+
     `keep` names faces that stay whatever they face, as a boolean mask over the faces: a part the
     centre sees through the opening, such as the underside of a cap's bill, which faces the centre
     from outside the shell and would otherwise be taken for inner surface and have the air under it
@@ -223,7 +228,7 @@ def solid_from_skin(mesh: trimesh.Trimesh, centre, lean: float = 0.3, keep=None)
     if not cand.any():
         raise ValueError("no face points toward the centre")
     which = np.flatnonzero(cand)
-    cand[which[~_seen_from(mesh, centre, which)]] = False
+    cand[which[~_seen_from(mesh, centre, which, skin=skin)]] = False
     if not cand.any():
         raise ValueError("no face that points toward the centre is seen from it")
     adj = np.asarray(mesh.face_adjacency)
@@ -265,8 +270,9 @@ def solid_from_skin(mesh: trimesh.Trimesh, centre, lean: float = 0.3, keep=None)
     return solid
 
 
-def _seen_from(mesh: trimesh.Trimesh, centre, which, cells: int = 64, batch: int = 4_000_000):
-    """Which of the faces `which` a ray from `centre` to their middles meets first.
+def _seen_from(mesh: trimesh.Trimesh, centre, which, cells: int = 64, batch: int = 4_000_000, skin: float = 0.0):
+    """Which of the faces `which` a ray from `centre` to their middles meets first, or within `skin`
+    of first: a face less than that nearer the centre is a fold or a second copy of the surface.
 
     Every ray starts at the one point, so the triangles are binned by their direction from it on a
     cube map (six faces of `cells` by `cells`), and each ray is tested only against the triangles in
@@ -313,7 +319,7 @@ def _seen_from(mesh: trimesh.Trimesh, centre, which, cells: int = 64, batch: int
     for i in range(0, len(pair_ray), batch):
         r, t_idx = pair_ray[i:i + batch], pair_tri[i:i + batch]
         t = _ray_t(mid[r] / dist[r][:, None], tri[t_idx])
-        before = (t < dist[r] - 1e-7) & ~own[i:i + batch]
+        before = (t < dist[r] - max(float(skin), 1e-7)) & ~own[i:i + batch]
         hidden[np.unique(r[before])] = True
     return ~hidden
 

{3d_base-0.3.2 → 3d_base-0.3.3}/tests/test_mesh.py

@@ -259,3 +259,29 @@ def test_a_bill_seen_through_the_opening_is_kept_when_named():
     assert told.is_watertight and told.is_winding_consistent and told.euler_number == 2
     assert not told.contains(under)[0]
     assert abs(told.bounds[1][0] - 20.0) < 1e-6
+
+
+def test_a_sliver_just_inside_the_inner_surface_neither_hides_it_nor_stays():
+    from base3d.mesh import solid_from_skin
+    # a dome shell with a closed sliver, 0.2 mm thick, lying 0.05 mm under the top of its inner
+    # surface: the kind of second copy a boolean or a vertex displacement leaves. Its far side faces
+    # outward and stands in front of the dome's top as seen from the centre
+    t = np.linspace(0, np.pi / 2, 24)
+    outer = np.c_[10 * np.sin(t), 10 * np.cos(t)]
+    inner = np.c_[9 * np.sin(t), 9 * np.cos(t)][::-1]
+    dome = _revolved(np.vstack([outer, inner, outer[:1]]), sections=64)
+    sliver = trimesh.creation.box(extents=(2.0, 2.0, 0.2))
+    sliver.apply_translation([0, 0, 9.0 - 0.05 - 0.1])
+    both = trimesh.util.concatenate([dome, sliver])
+    # the dome's faces keep their indices in the joined mesh; the top of its inner surface lies in
+    # the sliver's shadow, hidden by 0.05 mm with no skin and seen through it with the default
+    from base3d.mesh import _seen_from
+    c = dome.triangles_center
+    top = np.flatnonzero((c[:, 2] > 8.5) & (c[:, 2] < 9.2) & (np.linalg.norm(c[:, :2], axis=1) < 0.6))
+    assert len(top) > 0
+    assert not _seen_from(both, (0, 0, 0), top, skin=0.0).any()
+    assert _seen_from(both, (0, 0, 0), top, skin=0.5).all()
+    solid = solid_from_skin(both, centre=(0, 0, 0))
+    assert solid.is_watertight and solid.is_winding_consistent and solid.euler_number == 2
+    assert solid.contains([[0.0, 0.0, 8.9], [0.0, 0.0, 5.0]]).all()       # the top is solid through
+    assert abs(solid.volume - 2.0 / 3.0 * np.pi * 1000) < 0.03 * 2094