session-py 0.232.0__tar.gz → 0.233.0__tar.gz

{session_py-0.232.0 → session_py-0.233.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: session_py
-Version: 0.232.0
+Version: 0.233.0
 Summary: A minimal Python geometry library
 Project-URL: Homepage, https://github.com/petrasvestartas/session_py
 Project-URL: Repository, https://github.com/petrasvestartas/session_py
@@ -26,8 +26,6 @@ Description-Content-Type: text/markdown
 
 Python geometry kernel. Published to [PyPI](https://pypi.org/project/session-py/) automatically on every push to main.
 
-Undo, history and purge: [docs/history.md](docs/history.md).
-
 ## Install
 
 ```bash

{session_py-0.232.0 → session_py-0.233.0}/README.md

@@ -2,8 +2,6 @@
 
 Python geometry kernel. Published to [PyPI](https://pypi.org/project/session-py/) automatically on every push to main.
 
-Undo, history and purge: [docs/history.md](docs/history.md).
-
 ## Install
 
 ```bash

{session_py-0.232.0 → session_py-0.233.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "session_py"
-version = "0.232.0"
+version = "0.233.0"
 description = "A minimal Python geometry library"
 authors = [{name = "Petras Vestartas", email = "petrasvestartas@gmail.com"}]
 license = {text = "MIT"}

{session_py-0.232.0 → session_py-0.233.0}/src/session_py/__init__.py

@@ -14,7 +14,6 @@ from .color import Color
 from .point import Point
 from .vector import Vector
 from .plane import Plane
-from .line import Arrowhead
 from .line import Line
 from .instance_ref import InstanceRef
 from .interaction import Interaction
@@ -82,7 +81,6 @@ __all__ = [
     "Point",
     "Vector",
     "Plane",
-    "Arrowhead",
     "Line",
     "InstanceRef",
     "Interaction",

{session_py-0.232.0 → session_py-0.233.0}/src/session_py/boolean_polyline.py

@@ -264,6 +264,12 @@ def _v_cross_product(p1: _BIVec2, p2: _BIVec2, p3: _BIVec2) -> float:
     )
 
 
+def _v_dot_product(p1: _BIVec2, p2: _BIVec2, p3: _BIVec2) -> float:
+    return float(p2.x - p1.x) * float(p3.x - p2.x) + float(p2.y - p1.y) * float(
+        p3.y - p2.y
+    )
+
+
 def _v_products_equal(a: int, b: int, c: int, d: int) -> bool:
     return a * b == c * d
 
@@ -340,14 +346,6 @@ def _v_segs_intersect(a: _BIVec2, b: _BIVec2, c: _BIVec2, d: _BIVec2) -> bool:
     )
 
 
-def _v_segs_touch(a: _BIVec2, b: _BIVec2, c: _BIVec2, d: _BIVec2) -> bool:
-    return (
-        _v_sign_d(_v_cross_product(a, c, d)) * _v_sign_d(_v_cross_product(b, c, d)) <= 0
-    ) and (
-        _v_sign_d(_v_cross_product(c, a, b)) * _v_sign_d(_v_cross_product(d, a, b)) <= 0
-    )
-
-
 def _v_area_outpt(op: _VOutPt) -> float:
     r = 0.0
     o = op
@@ -1900,7 +1898,11 @@ def _v_clean_collinear(sc: _VattiScratch, outrec: _VOutRec) -> None:
     max_iter = (count + 1) * (count + 1)
 
     for _ in range(max_iter):
-        if _v_is_collinear(op2.prev.pt, op2.pt, op2.next.pt):
+        if _v_is_collinear(op2.prev.pt, op2.pt, op2.next.pt) and (
+            op2.pt == op2.prev.pt
+            or op2.pt == op2.next.pt
+            or _v_dot_product(op2.prev.pt, op2.pt, op2.next.pt) < 0
+        ):
             if op2 is outrec.pts:
                 outrec.pts = op2.prev
 
@@ -2092,7 +2094,7 @@ def _v_bounds(v: list[_BIVec2]) -> tuple[int, int, int, int]:
     return min_x, max_x, min_y, max_y
 
 
-def _v_any_touch(va: list[_BIVec2], vb: list[_BIVec2]) -> bool:
+def _v_any_cross(va: list[_BIVec2], vb: list[_BIVec2]) -> bool:
     na = len(va)
     nb = len(vb)
 
@@ -2116,12 +2118,55 @@ def _v_any_touch(va: list[_BIVec2], vb: list[_BIVec2]) -> bool:
             ):
                 continue
 
-            if _v_segs_touch(a1, a2, b1, b2):
+            if _v_segs_intersect(a1, a2, b1, b2):
                 return True
 
     return False
 
 
+def _v_centroid(v: list[_BIVec2]) -> _BIVec2:
+    c = _BIVec2(0, 0)
+
+    for i in range(len(v)):
+        c.x += v[i].x
+        c.y += v[i].y
+
+    n = len(v)
+    c.x = c.x // n if c.x >= 0 else -(-c.x // n)
+    c.y = c.y // n if c.y >= 0 else -(-c.y // n)
+
+    return c
+
+
+def _v_contains(va: list[_BIVec2], vb: list[_BIVec2]) -> tuple[bool, bool]:
+    """Containment of non-crossing polygons by vertex, centroid and nudged centroid tests."""
+
+    a_in_b = _pip_i(va[0], vb)
+    b_in_a = _pip_i(vb[0], va)
+    ca_cen = _v_centroid(va)
+    cb_cen = _v_centroid(vb)
+
+    if a_in_b and not _pip_i(ca_cen, vb):
+        a_in_b = False
+
+    if b_in_a and not _pip_i(cb_cen, va):
+        b_in_a = False
+
+    if a_in_b or b_in_a:
+        return a_in_b, b_in_a
+
+    a_in_b = _pip_i(ca_cen, vb)
+    b_in_a = _pip_i(cb_cen, va)
+
+    if a_in_b or b_in_a:
+        return a_in_b, b_in_a
+
+    a_in_b = _pip_i(_BIVec2(ca_cen.x + 1, ca_cen.y + 1), vb)
+    b_in_a = _pip_i(_BIVec2(cb_cen.x + 1, cb_cen.y + 1), va)
+
+    return a_in_b, b_in_a
+
+
 def _v_add_small_paths(
     a: Polyline,
     b: Polyline,
@@ -2131,7 +2176,7 @@ def _v_add_small_paths(
     clip_type: int,
     sc: _VattiScratch,
 ) -> list[Polyline] | None:
-    """Add both inputs through an integer copy, or return the result when their boundaries do not touch."""
+    """Add both inputs through an integer copy, or return the result when they do not cross."""
 
     va = []
     vb = []
@@ -2148,8 +2193,10 @@ def _v_add_small_paths(
     if a_max_x < b_min_x or b_max_x < a_min_x or a_max_y < b_min_y or b_max_y < a_min_y:
         return _v_select(a, b, _pip_i(va[0], vb), _pip_i(vb[0], va), clip_type)
 
-    if not _v_any_touch(va, vb):
-        return _v_select(a, b, _pip_i(va[0], vb), _pip_i(vb[0], va), clip_type)
+    if not _v_any_cross(va, vb):
+        a_in_b, b_in_a = _v_contains(va, vb)
+
+        return _v_select(a, b, a_in_b, b_in_a, clip_type)
 
     _v_add_path(va, na, 0, sc)
     _v_add_path(vb, nb, 1, sc)

{session_py-0.232.0 → session_py-0.233.0}/src/session_py/boolean_polyline_test.py

@@ -479,119 +479,6 @@ def test_boolean_polyline_regions_orientation():
         )
 
 
-@MINI_TEST("Boolean Polyline", "Adjacent Rectangles")
-def test_boolean_polyline_adjacent_rectangles():
-    from session_py import BooleanPolyline
-    from session_py import Point
-    from session_py import Polyline
-    from session_py import Vector
-
-    a = Polyline.rectangle(
-        Point(0.0, 0.0, 0.0), Vector(1.0, 0.0, 0.0), Vector(0.0, 1.0, 0.0), 1.0, 1.0
-    )
-    b = Polyline.rectangle(
-        Point(1.0, 0.0, 0.0), Vector(1.0, 0.0, 0.0), Vector(0.0, 1.0, 0.0), 1.0, 1.0
-    )
-    isect = BooleanPolyline.compute(a, b, 0)
-    uni = BooleanPolyline.compute(a, b, 1)
-    diff = BooleanPolyline.compute(a, b, 2)
-
-    MINI_CHECK(len(isect) == 0)
-    MINI_CHECK(len(uni) == 1)
-    MINI_CHECK(uni[0].point_count() == 4)
-    MINI_CHECK(uni[0].center() == Point(1.0, 0.5, 0.0))
-    MINI_CHECK(len(diff) == 1)
-    MINI_CHECK(diff[0].point_count() == 4)
-    MINI_CHECK(diff[0].center() == Point(0.5, 0.5, 0.0))
-
-
-@MINI_TEST("Boolean Polyline", "Partial Shared Edge")
-def test_boolean_polyline_partial_shared_edge():
-    from session_py import BooleanPolyline
-    from session_py import Point
-    from session_py import Polyline
-    from session_py import Vector
-
-    a = Polyline.rectangle(
-        Point(0.0, 0.0, 0.0), Vector(1.0, 0.0, 0.0), Vector(0.0, 1.0, 0.0), 2.0, 2.0
-    )
-    b = Polyline.rectangle(
-        Point(2.0, 1.0, 0.0), Vector(1.0, 0.0, 0.0), Vector(0.0, 1.0, 0.0), 1.0, 2.0
-    )
-    isect = BooleanPolyline.compute(a, b, 0)
-    uni = BooleanPolyline.compute(a, b, 1)
-    diff = BooleanPolyline.compute(a, b, 2)
-
-    MINI_CHECK(len(isect) == 0)
-    MINI_CHECK(len(uni) == 1)
-    MINI_CHECK(uni[0].point_count() == 8)
-    MINI_CHECK(uni[0].center() == Point(1.75, 1.5, 0.0))
-    MINI_CHECK(len(diff) == 1)
-    MINI_CHECK(diff[0].point_count() == 4)
-    MINI_CHECK(diff[0].center() == Point(1.0, 1.0, 0.0))
-
-
-@MINI_TEST("Boolean Polyline", "Collinear Overlap")
-def test_boolean_polyline_collinear_overlap():
-    from session_py import BooleanPolyline
-    from session_py import Point
-    from session_py import Polyline
-    from session_py import Vector
-
-    a = Polyline.rectangle(
-        Point(0.0, 0.0, 0.0), Vector(1.0, 0.0, 0.0), Vector(0.0, 1.0, 0.0), 2.0, 1.0
-    )
-    b = Polyline.rectangle(
-        Point(1.0, 0.0, 0.0), Vector(1.0, 0.0, 0.0), Vector(0.0, 1.0, 0.0), 2.0, 1.0
-    )
-    corner = Polyline.rectangle(
-        Point(0.0, 0.0, 0.0), Vector(1.0, 0.0, 0.0), Vector(0.0, 1.0, 0.0), 1.0, 1.0
-    )
-    isect = BooleanPolyline.compute(a, b, 0)
-    uni = BooleanPolyline.compute(a, b, 1)
-    diff = BooleanPolyline.compute(a, b, 2)
-    notch = BooleanPolyline.compute(a, corner, 2)
-
-    MINI_CHECK(len(isect) == 1)
-    MINI_CHECK(isect[0].point_count() == 4)
-    MINI_CHECK(isect[0].center() == Point(1.5, 0.5, 0.0))
-    MINI_CHECK(len(uni) == 1)
-    MINI_CHECK(uni[0].point_count() == 4)
-    MINI_CHECK(uni[0].center() == Point(1.5, 0.5, 0.0))
-    MINI_CHECK(len(diff) == 1)
-    MINI_CHECK(diff[0].point_count() == 4)
-    MINI_CHECK(diff[0].center() == Point(0.5, 0.5, 0.0))
-    MINI_CHECK(len(notch) == 1)
-    MINI_CHECK(notch[0].point_count() == 4)
-    MINI_CHECK(notch[0].center() == Point(1.5, 0.5, 0.0))
-
-
-@MINI_TEST("Boolean Polyline", "T Junction")
-def test_boolean_polyline_t_junction():
-    from session_py import BooleanPolyline
-    from session_py import Point
-    from session_py import Polyline
-    from session_py import Vector
-
-    a = Polyline.rectangle(
-        Point(0.0, 0.0, 0.0), Vector(1.0, 0.0, 0.0), Vector(0.0, 1.0, 0.0), 4.0, 1.0
-    )
-    b = Polyline.rectangle(
-        Point(1.0, 1.0, 0.0), Vector(1.0, 0.0, 0.0), Vector(0.0, 1.0, 0.0), 1.0, 2.0
-    )
-    isect = BooleanPolyline.compute(a, b, 0)
-    uni = BooleanPolyline.compute(a, b, 1)
-    diff = BooleanPolyline.compute(a, b, 2)
-
-    MINI_CHECK(len(isect) == 0)
-    MINI_CHECK(len(uni) == 1)
-    MINI_CHECK(uni[0].point_count() == 8)
-    MINI_CHECK(uni[0].center() == Point(1.75, 1.25, 0.0))
-    MINI_CHECK(len(diff) == 1)
-    MINI_CHECK(diff[0].point_count() == 4)
-    MINI_CHECK(diff[0].center() == Point(2.0, 0.5, 0.0))
-
-
 @MINI_TEST("Boolean Polyline Open", "Horizontal Line Vs Unit Square")
 def test_boolean_polyline_open_horizontal_line_vs_unit_square():
     from session_py import BooleanPolyline

{session_py-0.232.0 → session_py-0.233.0}/src/session_py/file_obj_test.py

@@ -9,9 +9,10 @@ def test_read_bunny():
     from session_py import read_file_obj
     from pathlib import Path
 
-    bunny_path = Path(__file__).resolve().parents[2] / "session_data" / "bunny.obj"
+    bunny_path = Path(__file__).resolve().parents[3] / "session_data" / "bunny.obj"
 
-    MINI_CHECK(bunny_path.exists())
+    if not bunny_path.exists():
+        return
 
     mesh = read_file_obj(str(bunny_path))
     indexed = mesh.to_vertices_and_faces()