scaffold-clamp-cleat: wip, reorg nfc

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

diff --git a/scaffold-clamp-common.scad b/scaffold-clamp-common.scad
index f3e25ade20b7e2f9f3807fed3b352bfa439f0dad..cc5bad153206ffca5fdb94c8685e9bcd2de9dff8 100644 (file)
--- a/scaffold-clamp-common.scad
+++ b/scaffold-clamp-common.scad
@@ -252,10 +252,11 @@ module VHookPlanDemo(){
 function cleat_frame_theta(s) = s * cleat_horn_l / cleat_curve_r * 360/TAU;
 function cleat_frame_z(s) = cleat_curve_r * (1 - cos(cleat_frame_theta(s)));
 function cleat_frame_x(s) = cleat_curve_r * sin(cleat_frame_theta(s));
+function cleat_frame_r(s) = ( cleat_horn_d_min * s +
+                             cleat_horn_d_max * (1-s) ) * 0.5;
 
 module CleatFrame(s) {
-  r = ( cleat_horn_d_min * s +
-       cleat_horn_d_max * (1-s) ) * 0.5;
+  r = cleat_frame_r(s);
   translate([cleat_frame_x(s), 0, cleat_frame_z(s)])
     rotate([0, 90, 0])
     scale([1, r[1]/r[0]])