From 48f0483d615c8d39059cab4212ad004245f4f373 Mon Sep 17 00:00:00 2001 From: Luke Hubmayer-Werner Date: Mon, 10 Feb 2025 23:19:31 +1030 Subject: [PATCH] More tweaks --- CFTubes.scad | 22 ++++++++++++---------- EllipticalNeck.scad | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CFTubes.scad b/CFTubes.scad index d7c5374..a00e00b 100644 --- a/CFTubes.scad +++ b/CFTubes.scad @@ -1192,7 +1192,7 @@ module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) { module MyNeck() { HeadPiece(); - TaperNeck(fret_side_marker_x_angle=-23, fret_side_marker_y_angle=5) MyBodySegment(); + TaperNeck(fret_side_marker_x_angle=-23, fret_side_marker_y_angle=15) MyBodySegment(); } module TrussRods(taper_points=segment_cuts, extra=0, tolerance=0.6) { @@ -1208,6 +1208,8 @@ module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) { [ 10, segment_cuts[3], 0], [ -9, segment_cuts[2], -17], [ 9, segment_cuts[2], -17], + [-10.25, segment_cuts[2], 2.5], + [ 10.25, segment_cuts[2], 2.5], ]; module Dowels() { for (v=dowel_positions) translate(v) Dowel(); @@ -1221,7 +1223,7 @@ module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) { Dowels(); // Add a belt hole - arc = arc_points([[16, -13], [-16, -13], [0, -3]], 1); + arc = arc_points([[23, -13], [-23, -13], [0, -3]], 1); belthole_r = 3; belthole_fn = 72; belthole_x0 = 135; @@ -1265,7 +1267,7 @@ module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) { for (i=[0,1]) translate([string_x(i, pickup_y), pickup_y, -10]) relay_coil_placeholder(); color("#FF000080") MyBody(); strings_reference(); - } else { + } else render() { if (segment < 0) { MyBody(); } else { @@ -1284,10 +1286,10 @@ module TwoBangerMk2(include_colours=[0,1], segment=-1, preview=false) { } colour_scheme = COLOURSCHEME_ABS_BLUE; -TwoBangerMk2(preview=true); -// segment = 1; -// color(colour_scheme[0]) TwoBangerMk2([0], segment); -// color(colour_scheme[1]) TwoBangerMk2([1], segment); -// color(colour_scheme[2]) TwoBangerMk2([2], segment); -// color(colour_scheme[3]) TwoBangerMk2([3], segment); -// color("red") TwoBangerMk2([4], segment); +// TwoBangerMk2(preview=true); +segment = 2; +color(colour_scheme[0]) TwoBangerMk2([0], segment); +color(colour_scheme[1]) TwoBangerMk2([1], segment); +color(colour_scheme[2]) TwoBangerMk2([2], segment); +color(colour_scheme[3]) TwoBangerMk2([3], segment); +color("red") TwoBangerMk2([4], segment); diff --git a/EllipticalNeck.scad b/EllipticalNeck.scad index 5cf86cd..43d5213 100644 --- a/EllipticalNeck.scad +++ b/EllipticalNeck.scad @@ -281,7 +281,7 @@ module TaperNeck( x1 = fret_scale_length(fret)+get_fret_width(fret)/2; diff = x0 - x1; mid = lerp(x0, x1, 0.67); - fontsize = min(5, diff*0.6); + fontsize = min(5, (diff-1)*0.6); rotate([0, fret_side_marker_y_angle-90, 0]) translate([0, mid, neck_width(mid)/2-3]) linear_extrude(50)