poster-tube-lid: rework bayo polygon

diff --git a/poster-tube-lid.scad.pl b/poster-tube-lid.scad.pl
index 01ec6aba0fd8923e21eec071c1fc5a4d5187fba6..399ea2519c5688924ae2caa52095dd8287e11d43 100755 (executable)
--- a/poster-tube-lid.scad.pl
+++ b/poster-tube-lid.scad.pl
@@ -16,7 +16,7 @@ rivet_thick = 1.67;
 rivet_width = 4.15 + 1.0;
 rivet_tall = 5.51 + 0.49;
 
-over_rivet_gap = 0.5;
+over_rivet_gap = 1.0;
 side_rivet_gap = 1.5;
 
 bayo_interf = 0.75;
@@ -31,9 +31,16 @@ side_taper = 1.0;
 
 bayo_above_gap = 1.0;
 
+bayo_entry = bayo_behind/3;
+
 // calculated
 
-side_height = rivet_posn + bayo_behind;
+bayo_entry_x = bayo_entry;
+bayo_entry_z = bayo_entry;
+bayo_inramp_x = bayo_entry;
+bayo_inramp_z = bayo_entry;
+
+side_height = rivet_posn + bayo_behind + rivet_thick/2;
 side_thick = rivet_tall + over_rivet_gap;
 
 top_z = top_thick + seal_thick;
@@ -49,20 +56,41 @@ $fa=5;
 
 // bayonet definition
 
-bayo_polygon = [[ -bayo_entry -rivet_entry_width,   -5             ],
-               [ -bayo_entry -rivet_entry_width,   0              ],
-               [ -rivet_entry_width, bayo_entry     ],
-//             [ bayo_entry,         bayo_top_z     ]
-               [ -rivet_entry_width, bayo_top_z ],
-               [  bayo_entry + 2*bayo_interf/bayo_interf_slope + bayo_interf_width,  bayo_behind             ],
-               [  bayo_entry + bayo_interf/bayo_interf_slope + bayo_interf_width,  bayo_behind + bayo_interf             ],
-               [  bayo_entry + bayo_interf/bayo_interf_slope,  bayo_behind + bayo_interf             ],
-               [  bayo_entry,  bayo_behind             ],
-               [  0,  bayo_behind - bayo_entry             ],
-               [  0,             bayo_entry             ],
-               [  bayo_entry,                      0             ],
-               [  bayo_entry,                      -5             ],
-                 ];
+bayo_a = [ bayo_entry_x, 0 ];
+bayo_p = [ 0, bayo_entry_z ];
+bayo_n = [ 0, bayo_behind-bayo_inramp_z ];
+bayo_m = [ bayo_inramp_x, bayo_behind ];
+bayo_l = bayo_m + bayo_interf * [ 1/bayo_interf_slope,  1 ];
+bayo_k = bayo_l + [ bayo_interf_width, 0 ];
+bayo_j = bayo_k + bayo_interf * [ 1/bayo_interf_slope, -1 ];
+bayo_i = bayo_j + [ rivet_width, 0 ];
+bayo_h = [ bayo_i[0], bayo_behind + rivet_thick + over_rivet_gap ];
+bayo_g = [ bayo_m[0] - rivet_width, bayo_h[1] ];
+
+bayo_e = [-bayo_p[0], bayo_p[1]] - [rivet_entry_width,0];
+bayo_d = [-bayo_a[0], bayo_a[1]] - [rivet_entry_width,0];
+bayo_c = bayo_d + [0,-5];
+bayo_b = bayo_a + [0,-5];
+
+bayo_f = [ bayo_e[0], bayo_g[1] - rivet_entry_width ];
+
+bayo_polygon = [ bayo_a,
+                bayo_b,
+                bayo_c,
+                bayo_d,
+                bayo_e,
+                bayo_f,
+                bayo_g,
+                bayo_h,
+                bayo_i,
+                bayo_j,
+                bayo_k,
+                bayo_l,
+                bayo_m,
+                bayo_n,
+                bayo_p ];
+
+echo(bayo_polygon);
 
 END