poster-tube-lid: catch wip, CatchPostDistort varying coarseness

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile b/Makefile
index a8126622d723ed0cee03ec8c2ef79c0069d75a6a..3345eaa53115feeaf18b1dbb98fe7d02babdfdca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -185,10 +185,10 @@ electron-token.stl: electron-token.scad
                screw-recess-test-number-s$s.fig \
                screw-recess-test-number-s$s.eps)
 
-poster-tube-lid,CatchPostDistort.stl: \
+poster-tube-lid,CatchPostDistort-fa%.stl: \
        distort-stl poster-tube-lid,CatchPreDistort.auto.stl
                ./distort-stl <poster-tube-lid,CatchPreDistort.auto.stl \
-                       project-cylinder 100 >$@.tmp
+                       set-fa $* project-cylinder 100 >$@.tmp
                mv -f $@.tmp $@
 
 %.dxf:         %.eps

diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 719ed590eb7b82b1cc90389592e2a432e9e88d27..bdad0c229d783ceb17881dccfe090eec6c61bb8f 100644 (file)
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -572,7 +572,10 @@ module CatchPreDistort(){ /////toplevel
 
 module CatchAssembly(){ /////toplevel
   scale(sm_inner_rad / 100)
-    import("poster-tube-lid,CatchPostDistort.stl", convexity=20);
+    import(str("poster-tube-lid,CatchPostDistort-fa",
+              (coarse ? 20 : 1),
+              ".stl"),
+          convexity=20);
 }
 
 //ProfilesDemo();