From 1ff8367f65e69e951740404ece918fa7ffcfb3a2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 3 Jun 2017 19:59:15 +0100 Subject: [PATCH] sewing-table: RoundCorner: move INREFFRAME into selector (nfc) --- sewing-table.scad.m4 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4 index 68ec6ed..4befae1 100644 --- a/sewing-table.scad.m4 +++ b/sewing-table.scad.m4 @@ -246,16 +246,18 @@ m4_define(`ROUNDCORNER_VARS',` module RoundCorner_selector(ci, adj) { ROUNDCORNER_VARS; - cube(bigr*2 + adj, center=true); + INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE { + cube(bigr*2 + adj, center=true); + } } module RoundCornerCut(ci) { // ci should be [this_cnr, right_cnr, left_cnr] // where right_cnr is to the right (ie, anticlockwise) ROUNDCORNER_VARS; - INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE { - difference(){ - RoundCorner_selector(ci, -0.1); + difference(){ + RoundCorner_selector(ci, -0.1); + INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE { translate([bigr, bigr, 0]) cylinder(center=true, h=20, r= bigr); } @@ -264,9 +266,9 @@ module RoundCornerCut(ci) { module RoundCornerAdd(ci) { ROUNDCORNER_VARS; - INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE { - intersection(){ - RoundCorner_selector(ci, +0.1); + intersection(){ + RoundCorner_selector(ci, +0.1); + INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE { translate([bigr, bigr, 0]) rotate_extrude(convexity=10, $fn=50) translate([bigr, 0]) -- 2.30.2