chiark / gitweb /
sewing-table: RoundCorner rework: correct centre
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 3 Jun 2017 20:08:55 +0000 (21:08 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 3 Jun 2017 20:08:55 +0000 (21:08 +0100)
sewing-table.scad.m4

index 30a8d1db0f9588795e8f5485ef58103810f053a6..3132b11658153ebe30aa0ce3356dd20d24974bae 100644 (file)
@@ -244,11 +244,11 @@ m4_define(`ROUNDCORNER_VARS',`
   bigr= round_cnr_rad - round_edge_rad;
   l_uvec = unitvector2d(left_cnr - this_cnr);
   r_uvec = unitvector2d(right_cnr - this_cnr);
   bigr= round_cnr_rad - round_edge_rad;
   l_uvec = unitvector2d(left_cnr - this_cnr);
   r_uvec = unitvector2d(right_cnr - this_cnr);
-  ctr = line_intersection_2d(
-      left_cnr  - clockwise2d(r_uvec) * round_cnr_rad,
-      this_cnr  - clockwise2d(r_uvec) * round_cnr_rad,
-      this_cnr  + clockwise2d(l_uvec) * round_cnr_rad,
-      right_cnr + clockwise2d(l_uvec) * round_cnr_rad )
+  lp1 = left_cnr  + clockwise2d(l_uvec) * bigr;
+  lp2 = this_cnr  + clockwise2d(l_uvec) * bigr;
+  lp3 = this_cnr  - clockwise2d(r_uvec) * bigr;
+  lp4 = right_cnr - clockwise2d(r_uvec) * bigr;
+  ctr = line_intersection_2d(lp1,lp2,lp3,lp4)
 ')
 
 module RoundCorner_selector(ci, adj) {
 ')
 
 module RoundCorner_selector(ci, adj) {