-- polygon() doesn't supply paths argument by default; OpenSCAD takes care of this manually

etjones-erisyon · etjones-erisyon · commit 126a0728f292 · 2020-11-16T08:43:04.000-06:00
-- polygon() allows points to be passed in as an IncludedSCADObject
diff --git a/solid/objects.py b/solid/objects.py
@@ -5,7 +5,7 @@
 from types import SimpleNamespace
 from typing import Dict, Optional, Sequence, Tuple, Union, List
 
-from .solidpython import OpenSCADObject
+from .solidpython import IncludedOpenSCADObject, OpenSCADObject
 
 PathStr = Union[Path, str]
 
@@ -22,10 +22,6 @@
 ScadSize = Union[int, Sequence[float]]
 OpenSCADObjectPlus = Union[OpenSCADObject, Sequence[OpenSCADObject]]
 
-def _to_point2s(points:Points) -> List[P2]:
-    return list([(p[0], p[1]) for p in points])
-
-
 class polygon(OpenSCADObject):
     """
     Create a polygon with the specified points and paths.
@@ -44,11 +40,18 @@ class polygon(OpenSCADObject):
     to 2D before compiling
     """
 
-    def __init__(self, points: Points, paths: Indexes = None) -> None:
-        if not paths:
-            paths = [list(range(len(points)))]
-        super().__init__('polygon',
-                         {'points': _to_point2s(points), 'paths': paths})
+    def __init__(self, points: Union[Points, IncludedOpenSCADObject], paths: Indexes = None) -> None:
+        # Force points to 2D if they're defined in Python, pass through if they're
+        # included OpenSCAD code
+        pts = points # type: ignore
+        if not isinstance(points, IncludedOpenSCADObject):
+            pts = list([(p[0], p[1]) for p in points]) # type: ignore
+
+        args = {'points':pts}
+        # If not supplied, OpenSCAD assumes all points in order for paths
+        if paths:
+            args['paths'] = paths # type: ignore
+        super().__init__('polygon', args)
 
 
 class circle(OpenSCADObject):
