X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=sewing-table.scad.m4;h=3b628e4b681bd7456ecc93699db15e9c150c8574;hp=41dfdc7368ebed289dc67afe5beacf8e6e366768;hb=16187156ae630cf20952fc84f67f01f9a3f6ca8d;hpb=84df5cdc00348209a493d24be73f64a825622eeb diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4 index 41dfdc7..3b628e4 100644 --- a/sewing-table.scad.m4 +++ b/sewing-table.scad.m4 @@ -67,10 +67,9 @@ module Post(){ } if (TEST) { tsz = tile_hard_edge_hole_dist - test_edge + 1; - tth = tile_th - test_tile_th + 0.1; - translate([0,0, tth/2 + test_tile_th - 0.1]) { - cube([post_dia, tsz*2, tth], center=true); - cube([tsz*2, post_dia, tth], center=true); + translate([0,0, tile_th/2]) { + cube([post_dia, tsz*2, tile_th], center=true); + cube([tsz*2, post_dia, tile_th], center=true); } } } @@ -101,9 +100,12 @@ module TileBase(botleft, topright){ if (TEST) { translate( concat(botleft + [thehd[0], 0], [0]) ) Commitid_BestCount([ size[0] - thehd[0]*2, thehd[1] ]); - mirror([0,0,1]) + mirror([0,0,1]) { translate(concat(botleft + [test_edge,test_edge], [test_tile_th])) - cube(concat(size - [test_edge,test_edge]*2, [tile_th])); + cube(concat(size - [test_edge,test_edge]*2, [tile_th])); + translate(concat(botleft_post, [-1])) + cube(concat(topright_post-botleft_post, [tile_th+2])); + } } } } @@ -141,6 +143,8 @@ module RoundEdge(left_cnr, right_cnr) { } module RoundCornerCut(ci) { + // ci should be [this_cnr, right_cnr] + // where right_cnr is to the right (ie, anticlockwise) this_cnr = ci[0]; right_cnr = ci[1]; offr= round_cnr_rad - round_edge_rad; @@ -256,6 +260,7 @@ module TestPiece1(){ ////toplevel [ 0, 0] ]; corners = TestPiece_holes2corners(holes); + rcs = [corners[0], corners[1]]; difference(){ union(){ TileBase(corners[0], corners[2]); @@ -264,9 +269,9 @@ module TestPiece1(){ ////toplevel RoundEdge(corners[3], corners[0]); } InterlockEdge(corners[1], corners[2], 1, nlobes=1); - RoundCornerCut(corners[0], corners[1]); + RoundCornerCut(rcs); } - RoundCornerAdd(corners[0], corners[1]); + RoundCornerAdd(rcs); } module TestPiece2(){ ////toplevel @@ -289,6 +294,8 @@ module TestDemo(){ ////toplevel } function Rectangle_corners(c0, sz) = + // returns the corners of a rectangle from c0 to c0+sz + // if sz is positive, the corners are anticlockwise starting with c0 [ c0 + [ 0, 0 ], c0 + [ sz[0], 0 ], c0 + [ sz[0], sz[1] ],