made all legacy examples work again :D

Author: jeff-dh

solid/examples/legacy/animation_example.py

@@ -1,4 +1,10 @@
 #! /usr/bin/env python3
+#
+# THIS IS NOT WORKING because it's obsolete.
+# See examples/12-animation.py
+# See examples/13-animated-bouncing-ball.py
+#
+
 import sys
 from math import cos, sin
 from typing import Optional

solid/examples/legacy/append_solidpython_code.py

@@ -1,9 +1,19 @@
 #! /usr/bin/env python3
+
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
+import sys
+from pathlib import Path
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
+sys.path.append(solidPath)
+#==================================================
+
 import sys
 
 from solid import scad_render_to_file
-from solid.objects import cylinder
-from solid.utils import up
+from solid import cylinder
+from solid import up
 
 SEGMENTS = 48
 

solid/examples/legacy/basic_builtins.py

@@ -1,10 +1,13 @@
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
 import sys
 from pathlib import Path
-
-solidPath = Path(__file__).absolute().parent.parent.parent.as_posix()
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
 sys.path.append(solidPath)
+#==================================================
 
-from solid.builtins import *
+from solid import *
 from solid import scad_render_to_file
 
 def second_func():

solid/examples/legacy/basic_geometry.py

@@ -1,9 +1,19 @@
 #! /usr/bin/env python3
+
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
+import sys
+from pathlib import Path
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
+sys.path.append(solidPath)
+#==================================================
+
 import sys
 
 from solid import scad_render_to_file
-from solid.builtins import cube, cylinder, difference, translate, union
-from solid.utils import right
+from solid import cube, cylinder, difference, translate, union
+from solid import right
 
 SEGMENTS = 48
 

solid/examples/legacy/basic_scad_include.py

@@ -1,6 +1,12 @@
 #! /usr/bin/env python3
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
 import sys
 from pathlib import Path
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
+sys.path.append(solidPath)
+#==================================================
 
 from solid import scad_render_to_file, import_scad, use
 

solid/examples/legacy/bom_scad.py

@@ -17,16 +17,19 @@
 #
 #       -ETJ 08 Mar 2011
 
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
 import sys
 from pathlib import Path
-
-solidPath = Path(__file__).absolute().parent.parent.parent.as_posix()
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
 sys.path.append(solidPath)
+#==================================================
 
 from solid import scad_render_to_file
-from solid.builtins import cube, color, cylinder, difference, translate, union
-from solid.utils import EPSILON
-from solid.utils import bill_of_materials, bom_part, set_bom_headers
+from solid import cube, color, cylinder, difference, translate, union
+from solid.extensions.legacy.utils import EPSILON
+from solid.extensions.legacy.bill_of_materials import bill_of_materials, bom_part, set_bom_headers
 
 head_rad = 2.65
 head_height = 2.8

solid/examples/legacy/convenience_example.py

@@ -1,8 +1,11 @@
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
 import sys
 from pathlib import Path
-
-solidPath = Path(__file__).absolute().parent.parent.parent.as_posix()
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
 sys.path.append(solidPath)
+#==================================================
 
 from solid import *
 from solid import scad_render_to_file

solid/examples/legacy/koch.py

@@ -1,12 +1,21 @@
 #! /usr/bin/env python3
+
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
+import sys
+from pathlib import Path
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
+sys.path.append(solidPath)
+#==================================================
+
 import sys
 from pathlib import Path
 
 from euclid3 import LineSegment2, LineSegment3, Point2, Point3
 
-from solid import scad_render_to_file
-from solid.objects import polygon, polyhedron, union
-from solid.utils import forward, up
+from solid import scad_render_to_file, polygon, polyhedron, union
+from solid.extensions.legacy.utils import forward, up
 
 ONE_THIRD = 1 / 3
 
@@ -85,7 +94,7 @@ def kochify(seg, height_ratio=0.33, left_loc=0.33, midpoint_loc=0.5, right_loc=0
             LineSegment2(r, b)]
 
 
-def main_3d(out_dir):
+def main_3d():
     gens = 4
 
     # Parameters
@@ -143,12 +152,11 @@ def main_3d(out_dir):
                 )
         )
 
-    file_out = Path(out_dir) / 'koch_3d.scad'
-    file_out = scad_render_to_file(all_polys, file_out, include_orig_code=True)
+    file_out = scad_render_to_file(all_polys, include_orig_code=True)
     print(f"{__file__}: SCAD file written to: {file_out}")
 
 
-def main(out_dir):
+def main():
     # Parameters
     height_ratio = 0.25
     left_loc = ONE_THIRD
@@ -189,11 +197,11 @@ def main(out_dir):
         edges = [list(range(len(points)))]
         all_polys.add(forward(h)(polygon(points=points, paths=edges)))
 
-    file_out = scad_render_to_file(all_polys, out_dir=out_dir, include_orig_code=True)
+    filename = Path(__file__).with_suffix(".2.scad")
+    file_out = scad_render_to_file(all_polys, filename=filename, include_orig_code=True)
     print(f"{__file__}: SCAD file written to: {file_out}")
 
 
 if __name__ == '__main__':
-    out_dir = sys.argv[1] if len(sys.argv) > 1 else None
-    main_3d(out_dir)
-    main(out_dir)
+    main_3d()
+    main()

solid/examples/legacy/libs_example.py

@@ -1,9 +1,11 @@
-
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
 import sys
 from pathlib import Path
-
-solidPath = Path(__file__).absolute().parent.parent.parent.as_posix()
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
 sys.path.append(solidPath)
+#==================================================
 
 from solid import import_scad, scad_render_to_file
 

solid/examples/legacy/path_extrude_example.py

@@ -1,18 +1,25 @@
 #! /usr/bin/env python3
-from solid.objects import linear_extrude
-from solid.solidpython import OpenSCADObject
+
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
 import sys
-from math import cos, radians, sin, pi, tau
 from pathlib import Path
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
+sys.path.append(solidPath)
+#==================================================
 
+import sys
+from math import cos, radians, sin, pi, tau
+from pathlib import Path
 from euclid3 import Point2, Point3, Vector3
+from typing import Set, Sequence, List, Callable, Optional, Union, Iterable, Tuple
 
+from solid import linear_extrude
+from solid.core.object_base import OpenSCADObject
 from solid import scad_render_to_file, text, translate, cube, color, rotate
-from solid.utils import UP_VEC, Vector23, distribute_in_grid, extrude_along_path
-from solid.utils import down, right, frange, lerp
-
-
-from typing import Set, Sequence, List, Callable, Optional, Union, Iterable, Tuple
+from solid.extensions.legacy.utils import UP_VEC, Vector23, distribute_in_grid, extrude_along_path
+from solid.extensions.legacy.utils import down, right, frange, lerp
 
 SEGMENTS = 48
 PATH_RAD = 50 

solid/examples/legacy/screw_thread_example.py

@@ -1,9 +1,18 @@
 #! /usr/bin/env python3
+
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
+import sys
+from pathlib import Path
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
+sys.path.append(solidPath)
+#==================================================
+
 import sys
 
-from solid import scad_render_to_file
-from solid import screw_thread
-from solid.objects import cylinder
+from solid import scad_render_to_file, cylinder
+from solid.extensions.legacy import screw_thread
 
 SEGMENTS = 48
 

solid/examples/legacy/sierpinski.py

@@ -1,11 +1,21 @@
 #! /usr/bin/env python3
+
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
+import sys
+from pathlib import Path
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
+sys.path.append(solidPath)
+#==================================================
+
 import math
 import random
 import sys
 from pathlib import Path
 
 from solid import scad_render_to_file
-from solid.objects import cube, polyhedron, translate, union
+from solid import cube, polyhedron, translate, union
 
 
 # =========================================================
@@ -100,6 +110,5 @@ def sierpinski_3d(generation, scale=1, midpoint_weight=0.5, jitter_range_vec=Non
         for p in tet.points:
             t.add(translate(p).add(cube(5, center=True)))
 
-    file_out = out_dir / f'gasket_{generations}_gen.scad'
-    file_out = scad_render_to_file(t, file_out)
+    file_out = scad_render_to_file(t)
     print(f"{__file__}: SCAD file written to: \n{file_out}")

solid/examples/legacy/solidpython_template.py

@@ -1,6 +1,6 @@
 #! /usr/bin/env python3
 from solid import scad_render_to_file
-from solid.objects import union
+from solid import union
 
 SEGMENTS = 48
 

solid/examples/legacy/splines_example.py

@@ -1,13 +1,24 @@
-#! /usr/bin/env python
-import os
+#! /usr/bin/env python3
+
+# ======================================================
+# = add relative path to the solid package to sys.path =
+# ======================================================
 import sys
-from solid import *
-from solid.utils import Red, right, forward, back
+from pathlib import Path
+solidPath = Path(__file__).absolute().parent.parent.parent.parent.as_posix()
+sys.path.append(solidPath)
+#==================================================
 
-from solid.splines import catmull_rom_points, catmull_rom_polygon, control_points
-from solid.splines import bezier_polygon, bezier_points
+import os
+import sys
 from euclid3 import Vector2, Vector3, Point2, Point3
 
+from solid import *
+from solid.extensions.legacy.utils import Red, right, forward, back
+from solid.extensions.legacy.splines import catmull_rom_points, catmull_rom_polygon,\
+                                            control_points, bezier_polygon,\
+                                            bezier_points
+
 def assembly():
     # Catmull-Rom Splines
     a = basic_catmull_rom()                         # Top row in OpenSCAD output
@@ -123,7 +134,7 @@ def bottle_shape(width: float, height: float, neck_width:float=None, neck_height
 
     # Make OpenSCAD polygons out of the shapes once all points are calculated
     a = polygon(cr_points) 
-    a += mirror(v=(1,0))(a)
+    a += mirror((1,0))(a)
 
     # Show control points. These aren't required for anything, but seeing them
     # makes refining a curve much easier