doveclip rationalise ExtenderPillars arguments NFC

[reprap-play.git] / doveclip.scad

diff --git a/doveclip.scad b/doveclip.scad
index 95ae4509f7fc1c2fcf864a4092330800c0d45d64..7deca4467029cb42bc9a3f3e49ecd25a03c9c98b 100644 (file)
--- a/doveclip.scad
+++ b/doveclip.scad
@@ -76,37 +76,28 @@ module DoveClipPairSane(baseextend=0, h=7, count=2) {
 function DoveClipPairSane_width(count=2) =
   2 * (nomrad + jawthick + ((nomrad*2 + jawthick) * (count-1)/2));
 
-module DoveClipExtender(length, ha=7, hb=7, counta=2, countb=2,
-                       pillarw=3.5, pillarslope=0.75, webthick=1) {
+module ExtenderPillars(length, width, height,
+                      pillarw=3.5, pillarslope=0.75, webthick=1) {
   pillarr=pillarw/2;
 
-  mirror([1,0,0])
-    DoveClipPairSane(h=ha, count=counta);
-  translate([length,0,0])
-    DoveClipPairSane(h=hb, count=countb);
-  pillarlen = length - DoveClip_depth() * 2 + 2;
-  pilesw = min(DoveClipPairSane_width(counta), DoveClipPairSane_width(countb))
-    - 0.5 - pillarr*2;
-  pilesh = min(ha, hb) - 0.5;
   d = 0.25;
-  echo(pilesh);
 
   intangle = atan(pillarslope);
   polyjx = sin(intangle)*pillarr;
   polyjy = cos(intangle)*pillarr;
   polyex = -tan(intangle+90)*pillarr;
-  webmidy = pilesh/2+d;
+  webmidy = height/2+d;
 
   translate([DoveClip_depth() - 1, 0, 0]) {
-    for (ymir=[0,1]) mirror([0,ymir,0]) translate([0,-pilesw/2,0]) {
+    for (ymir=[0,1]) mirror([0,ymir,0]) translate([0,-width/2,0]) {
        for (xmir=[0,1])
-         translate([0,0,pilesh/2]) mirror([0,0,xmir])
-             translate([0,0,-pilesh/2]) {
+         translate([0,0,height/2]) mirror([0,0,xmir])
+             translate([0,0,-height/2]) {
            intersection() {
              translate([-1, -pillarr-5, 0.01])
-               cube([pillarlen+2, pilesh+pillarr*2+10, pilesw]);
+               cube([length+2, height+pillarr*2+10, width]);
              mirror([1,0,0]) rotate([0,-90,0])
-               linear_extrude(height=pillarlen) union(){
+               linear_extrude(height=length) union(){
                  circle(r=pillarr, $fn=20);
                  polygon([[polyjx,polyjy-0.1], [polyex, 0],
                           [polyjx,-(polyjy-0.1)]]);
@@ -119,4 +110,23 @@ module DoveClipExtender(length, ha=7, hb=7, counta=2, countb=2,
   }
 }
 
+module DoveClipExtender(length, ha=7, hb=7, counta=2, countb=2,
+                       pillarw=3.5, pillarslope=0.75, webthick=1) {
+
+  mirror([1,0,0])
+    DoveClipPairSane(h=ha, count=counta);
+  translate([length,0,0])
+    DoveClipPairSane(h=hb, count=countb);
+  pillarlen = length - DoveClip_depth() * 2 + 2;
+
+  pilesw = min(DoveClipPairSane_width(counta), DoveClipPairSane_width(countb))
+    - 0.5 - pillarw;
+  pilesh = min(ha, hb) - 0.5;
+
+  echo(pilesh);
+
+  ExtenderPillars(pillarlen, pilesw, pilesh,
+                 pillarw=pillarw, pillarslope=pillarslope, webthick=webthick);
+}
+
 //DoveClipExtender(length=100, ha=16, hb=20, counta=3, countb=4);