From 73b55861b6b5c4ea35226c825d7101716ae7deff Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Wed, 18 Dec 2024 13:43:14 -0600 Subject: [PATCH] remove the box frame pieces, all pieces are of the extended lineage Signed-off-by: Brian S. Stephan --- ...l-together-demo-extended-with-windows.scad | 14 +++--- demo/all-together-demo-extended.scad | 10 ++--- demo/all-together-demo-solo.scad | 8 ++-- demo/all-together-demo.scad | 6 +-- demo/blown-up-demo.scad | 6 +-- src/extras/bss-ae/extended-back.scad | 2 +- src/extras/bss-ae/extended-side-no-back.scad | 4 +- src/extras/bss-ae/interconnect-x.scad | 2 +- .../box/front-or-back-aux-and-neutrik.scad | 28 ------------ .../pieces/box/front-or-back-inner-wall.scad | 39 ----------------- .../front-or-back-windowed-backslashes.scad | 32 -------------- ...front-or-back-windowed-forwardslashes.scad | 22 ---------- .../front-or-back-windowed-horiz-stripes.scad | 29 ------------- .../pieces/box/front-or-back-windowed.scad | 27 ------------ src/frames/pieces/box/front-or-back.scad | 30 ------------- src/frames/pieces/box/side-inner-wall.scad | 43 ------------------- .../pieces/box/side-windowed-backslashes.scad | 30 ------------- .../box/side-windowed-forwardslashes.scad | 22 ---------- .../box/side-windowed-horiz-stripes.scad | 29 ------------- src/frames/pieces/box/side-windowed.scad | 23 ---------- src/frames/pieces/box/side.scad | 23 ---------- .../front-or-back-aux-and-neutrik.scad | 0 .../front-or-back-inner-wall.scad | 0 .../front-or-back-trapezoid.scad | 0 .../front-or-back-windowed-backslashes.scad | 0 ...front-or-back-windowed-forwardslashes.scad | 0 .../front-or-back-windowed-horiz-stripes.scad | 0 .../front-or-back-windowed.scad | 0 .../pieces/{extended => }/front-or-back.scad | 0 src/frames/pieces/interconnect.scad | 2 +- .../{extended => }/side-inner-wall.scad | 0 .../pieces/{extended => }/side-longish.scad | 0 ...trapezoid-extended-to-front-trapezoid.scad | 0 .../pieces/{extended => }/side-trapezoid.scad | 0 .../side-windowed-backslashes.scad | 0 .../side-windowed-forwardslashes.scad | 0 .../side-windowed-horiz-stripes.scad | 0 src/frames/pieces/{extended => }/side.scad | 0 38 files changed, 27 insertions(+), 404 deletions(-) delete mode 100644 src/frames/pieces/box/front-or-back-aux-and-neutrik.scad delete mode 100644 src/frames/pieces/box/front-or-back-inner-wall.scad delete mode 100644 src/frames/pieces/box/front-or-back-windowed-backslashes.scad delete mode 100644 src/frames/pieces/box/front-or-back-windowed-forwardslashes.scad delete mode 100644 src/frames/pieces/box/front-or-back-windowed-horiz-stripes.scad delete mode 100644 src/frames/pieces/box/front-or-back-windowed.scad delete mode 100644 src/frames/pieces/box/front-or-back.scad delete mode 100644 src/frames/pieces/box/side-inner-wall.scad delete mode 100644 src/frames/pieces/box/side-windowed-backslashes.scad delete mode 100644 src/frames/pieces/box/side-windowed-forwardslashes.scad delete mode 100644 src/frames/pieces/box/side-windowed-horiz-stripes.scad delete mode 100644 src/frames/pieces/box/side-windowed.scad delete mode 100644 src/frames/pieces/box/side.scad rename src/frames/pieces/{extended => }/front-or-back-aux-and-neutrik.scad (100%) rename src/frames/pieces/{extended => }/front-or-back-inner-wall.scad (100%) rename src/frames/pieces/{extended => }/front-or-back-trapezoid.scad (100%) rename src/frames/pieces/{extended => }/front-or-back-windowed-backslashes.scad (100%) rename src/frames/pieces/{extended => }/front-or-back-windowed-forwardslashes.scad (100%) rename src/frames/pieces/{extended => }/front-or-back-windowed-horiz-stripes.scad (100%) rename src/frames/pieces/{extended => }/front-or-back-windowed.scad (100%) rename src/frames/pieces/{extended => }/front-or-back.scad (100%) rename src/frames/pieces/{extended => }/side-inner-wall.scad (100%) rename src/frames/pieces/{extended => }/side-longish.scad (100%) rename src/frames/pieces/{extended => }/side-trapezoid-extended-to-front-trapezoid.scad (100%) rename src/frames/pieces/{extended => }/side-trapezoid.scad (100%) rename src/frames/pieces/{extended => }/side-windowed-backslashes.scad (100%) rename src/frames/pieces/{extended => }/side-windowed-forwardslashes.scad (100%) rename src/frames/pieces/{extended => }/side-windowed-horiz-stripes.scad (100%) rename src/frames/pieces/{extended => }/side.scad (100%) diff --git a/demo/all-together-demo-extended-with-windows.scad b/demo/all-together-demo-extended-with-windows.scad index df29652..dd49472 100644 --- a/demo/all-together-demo-extended-with-windows.scad +++ b/demo/all-together-demo-extended-with-windows.scad @@ -5,9 +5,9 @@ include include -use -use -use +use +use +use use use use @@ -24,10 +24,10 @@ color(top_panel_color) translate([-panel_x/2, 0, frame_z/2-panel_z+0.01]) lever_ color(top_panel_color) translate([panel_x/2, 0, frame_z/2-panel_z+0.01]) sega_2p_nine_plus_control_panel_with_mount(); color(frame_side_color) translate([-frame_x/2+4, 0, -2.5]) side_trapezoid_frame_piece(); color(frame_side_color) translate([frame_x/2-4, 0, -2.5]) mirror([1, 0, 0]) side_trapezoid_frame_piece(); -color(frame_top_bottom_color) translate([-frame_x/2+4, 0, -2.5]) horiz_striped_windowed_front_or_back_box_frame_piece_for_extended_side(); -color(frame_top_bottom_color) translate([frame_x/2-4, 0, -2.5]) horiz_striped_windowed_front_or_back_box_frame_piece_for_extended_side(); -color(frame_top_bottom_color) translate([-frame_x/2+4, 0, -2.5]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_box_frame_piece_for_extended_side(); -color(frame_top_bottom_color) translate([frame_x/2-4, 0, -2.5]) rotate([180, 180, 0]) front_or_back_aux_and_neutrik_box_frame_piece_for_extended_side(); +color(frame_top_bottom_color) translate([-frame_x/2+4, 0, -2.5]) horiz_striped_windowed_front_or_back_frame_piece(); +color(frame_top_bottom_color) translate([frame_x/2-4, 0, -2.5]) horiz_striped_windowed_front_or_back_frame_piece(); +color(frame_top_bottom_color) translate([-frame_x/2+4, 0, -2.5]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_frame_piece(); +color(frame_top_bottom_color) translate([frame_x/2-4, 0, -2.5]) rotate([180, 180, 0]) front_or_back_aux_and_neutrik_frame_piece(); color(bottom_panel_color) translate([-panel_x/2, 0, -5-frame_z/2+5]) panel(); color(bottom_panel_color) translate([panel_x/2, 0, -5-frame_z/2+5]) panel(); diff --git a/demo/all-together-demo-extended.scad b/demo/all-together-demo-extended.scad index a82a4c4..7f8e8a8 100644 --- a/demo/all-together-demo-extended.scad +++ b/demo/all-together-demo-extended.scad @@ -5,9 +5,9 @@ include include -use -use -use +use +use +use use use use @@ -26,8 +26,8 @@ color(frame_side_color) translate([-frame_x/2+4, 0, -2.5]) side_trapezoid_extend color(frame_side_color) translate([frame_x/2-4, 0, -2.5]) mirror([1, 0, 0]) side_trapezoid_extended_to_front_frame_piece(); color(frame_top_bottom_color) translate([-frame_x/2+4, 0, -2.5]) front_or_back_trapezoid_frame_piece(); color(frame_top_bottom_color) translate([frame_x/2-4, 0, -2.5]) front_or_back_trapezoid_frame_piece(); -color(frame_top_bottom_color) translate([-frame_x/2+4, 0, -2.5]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_box_frame_piece_for_extended_side(); -color(frame_top_bottom_color) translate([frame_x/2-4, 0, -2.5]) rotate([180, 180, 0]) front_or_back_aux_and_neutrik_box_frame_piece_for_extended_side(); +color(frame_top_bottom_color) translate([-frame_x/2+4, 0, -2.5]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_frame_piece(); +color(frame_top_bottom_color) translate([frame_x/2-4, 0, -2.5]) rotate([180, 180, 0]) front_or_back_aux_and_neutrik_frame_piece(); color(bottom_panel_color) translate([-panel_x/2, 0, -5-frame_z/2+5]) panel(); color(bottom_panel_color) translate([panel_x/2, 0, -5-frame_z/2+5]) panel(); diff --git a/demo/all-together-demo-solo.scad b/demo/all-together-demo-solo.scad index 9236052..448ef53 100644 --- a/demo/all-together-demo-solo.scad +++ b/demo/all-together-demo-solo.scad @@ -5,9 +5,9 @@ include include -use -use -use +use +use +use use use use @@ -22,7 +22,7 @@ color(top_panel_color) translate([0, 0, frame_z/2-panel_z+0.01]) lever_and_sega_ color(frame_side_color) translate([0, 0, -2.5]) side_trapezoid_extended_to_front_frame_piece(); color(frame_side_color) translate([0, 0, -2.5]) mirror([1, 0, 0]) side_trapezoid_extended_to_front_frame_piece(); color(frame_top_bottom_color) translate([0, 0, -2.5]) front_or_back_trapezoid_frame_piece(); -color(frame_top_bottom_color) translate([0, 0, -2.5]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_box_frame_piece_for_extended_side(); +color(frame_top_bottom_color) translate([0, 0, -2.5]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_frame_piece(); color(bottom_panel_color) translate([0, 0, -5-frame_z/2+5]) panel(); color(top_deco_color) translate([-65, 5, 3+frame_z/2-panel_z]) jlf_dustwasher(); diff --git a/demo/all-together-demo.scad b/demo/all-together-demo.scad index a2119ee..85b6172 100644 --- a/demo/all-together-demo.scad +++ b/demo/all-together-demo.scad @@ -5,9 +5,9 @@ include include -use -use -use +use +use +use use use use diff --git a/demo/blown-up-demo.scad b/demo/blown-up-demo.scad index 675c47c..84bcda1 100644 --- a/demo/blown-up-demo.scad +++ b/demo/blown-up-demo.scad @@ -6,9 +6,9 @@ include include use -use -use -use +use +use +use use use use diff --git a/src/extras/bss-ae/extended-back.scad b/src/extras/bss-ae/extended-back.scad index 00ef57b..1e5c7f4 100644 --- a/src/extras/bss-ae/extended-back.scad +++ b/src/extras/bss-ae/extended-back.scad @@ -6,7 +6,7 @@ include include -use +use module back_piece_extension() { // combine the original wall with a copy to "pull" the wall out diff --git a/src/extras/bss-ae/extended-side-no-back.scad b/src/extras/bss-ae/extended-side-no-back.scad index ef9ee3d..fef1f04 100644 --- a/src/extras/bss-ae/extended-side-no-back.scad +++ b/src/extras/bss-ae/extended-side-no-back.scad @@ -7,8 +7,8 @@ include include use -use -use +use +use module side_frame_piece_wall() { // this doesn't use the side_frame_piece because of the 45 degree angle geometry diff --git a/src/extras/bss-ae/interconnect-x.scad b/src/extras/bss-ae/interconnect-x.scad index c4506f6..205b940 100644 --- a/src/extras/bss-ae/interconnect-x.scad +++ b/src/extras/bss-ae/interconnect-x.scad @@ -6,7 +6,7 @@ include include -use +use module interconnect_frame_half_piece() { translate([0, frame_y/2-frame_wall, 0]) difference() { diff --git a/src/frames/pieces/box/front-or-back-aux-and-neutrik.scad b/src/frames/pieces/box/front-or-back-aux-and-neutrik.scad deleted file mode 100644 index b061a21..0000000 --- a/src/frames/pieces/box/front-or-back-aux-and-neutrik.scad +++ /dev/null @@ -1,28 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use - -module front_or_back_aux_and_neutrik_box_frame_piece() { - difference() { - front_or_back_box_frame_piece(); - - // aux button holes - translate([-35.25, -101.5, 0]) rotate([90, 0, 0]) aux_control_three_button_cluster(); - translate([-35.25, -(frame_y/2)+neutrik_panel_thickness+4, 0]) frame_cutout(); - translate([-72.25, -(frame_y/2)+neutrik_panel_thickness+4, 0]) frame_cutout(); - translate([2, -(frame_y/2)+neutrik_panel_thickness+4, 0]) frame_cutout(); - - // neutrix button hole - translate([frame_center_to_neutrik, -(frame_y/2)+neutrik_panel_thickness, 0]) - rotate([270, 0, 0]) neutrik_d_mount(); - translate([frame_center_to_neutrik, -(frame_y/2)+neutrik_panel_thickness+4, 0]) - frame_cutout(); - } -} - -front_or_back_aux_and_neutrik_box_frame_piece(); diff --git a/src/frames/pieces/box/front-or-back-inner-wall.scad b/src/frames/pieces/box/front-or-back-inner-wall.scad deleted file mode 100644 index 1744810..0000000 --- a/src/frames/pieces/box/front-or-back-inner-wall.scad +++ /dev/null @@ -1,39 +0,0 @@ -/* The inner top/bottom wall of the frame, for being displayed through a windowed part. - * - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use - -module mount_column_cutout() { - intersection() { - frame_mount_column(); - cube([frame_mount_column_width*3/2, frame_mount_column_width*3/2, inner_frame_z*5/8], center=true); - } -} - -module front_or_back_inner_wall_frame_base_piece() { - difference() { - // Z is scaled so that some part of the original part inner wall is retained - scale([1, 1, inner_frame_z_decorative_scale]) front_or_back_box_frame_piece(); - // minus the outer wall - translate([0, -(frame_y-frame_wall)/2, 0]) cube([frame_x, frame_wall, frame_z], center=true); - // minus half of the mounting posts (the other half provided by the outer wall) - translate([-panel_to_frame_point_x, -(panel_to_frame_point_y), 0]) rotate([0, 0, 180]) - mount_column_cutout(); - translate([panel_to_frame_point_x, -(panel_to_frame_point_y), 0]) rotate([0, 0, 270]) - mount_column_cutout(); - } -} - -module front_or_back_inner_wall_frame_piece() { - front_or_back_inner_wall_frame_base_piece(); - // extend the outward face 2mm in order to have it cut deeper into the frame outer wall - translate([0, -(frame_y-frame_wall)/2, 0]) rotate([-90, 0, 0]) linear_extrude(height=2) projection() - translate([0, 0, 50]) rotate([90, 0, 0]) front_or_back_inner_wall_frame_base_piece(); -} - -front_or_back_inner_wall_frame_piece(); diff --git a/src/frames/pieces/box/front-or-back-windowed-backslashes.scad b/src/frames/pieces/box/front-or-back-windowed-backslashes.scad deleted file mode 100644 index 839b771..0000000 --- a/src/frames/pieces/box/front-or-back-windowed-backslashes.scad +++ /dev/null @@ -1,32 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use -use - -module backslashes() { - translate([-70, -(frame_y-frame_wall)/2, 0]) slash_cutout(); - translate([-50, -(frame_y-frame_wall)/2, 0]) slash_cutout(); - translate([-30, -(frame_y-frame_wall)/2, 0]) slash_cutout(); - translate([-10, -(frame_y-frame_wall)/2, 0]) slash_cutout(); - translate([10, -(frame_y-frame_wall)/2, 0]) slash_cutout(); - translate([30, -(frame_y-frame_wall)/2, 0]) slash_cutout(); - translate([50, -(frame_y-frame_wall)/2, 0]) slash_cutout(); - translate([70, -(frame_y-frame_wall)/2, 0]) slash_cutout(); -} - -module backslashes_windowed_front_or_back_box_frame_piece() { - difference() { - front_or_back_box_frame_piece(); - // subtract slashes from the frame wall - backslashes(); - // subtract the inner wall area that will be provided by the other piece - front_or_back_inner_wall_frame_piece(); - } -} - -backslashes_windowed_front_or_back_box_frame_piece(); diff --git a/src/frames/pieces/box/front-or-back-windowed-forwardslashes.scad b/src/frames/pieces/box/front-or-back-windowed-forwardslashes.scad deleted file mode 100644 index 938855f..0000000 --- a/src/frames/pieces/box/front-or-back-windowed-forwardslashes.scad +++ /dev/null @@ -1,22 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use -use -use - -module forwardslashes_windowed_front_or_back_box_frame_piece() { - difference() { - front_or_back_box_frame_piece(); - // subtract slashes from the frame wall - mirror([0, 0, 1]) backslashes(); - // subtract the inner wall area that will be provided by the other piece - front_or_back_inner_wall_frame_piece(); - } -} - -forwardslashes_windowed_front_or_back_box_frame_piece(); diff --git a/src/frames/pieces/box/front-or-back-windowed-horiz-stripes.scad b/src/frames/pieces/box/front-or-back-windowed-horiz-stripes.scad deleted file mode 100644 index 7593802..0000000 --- a/src/frames/pieces/box/front-or-back-windowed-horiz-stripes.scad +++ /dev/null @@ -1,29 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use -use - -module front_stripe() { - cube([frame_x-(frame_mount_column_width*1.75)*2, frame_wall, 5], center=true); -} - -module horiz_striped_windowed_front_or_back_box_frame_piece() { - difference() { - front_or_back_box_frame_piece(); - // subtract frame wall windows - translate([0, -(frame_y-frame_wall)/2, 18]) front_stripe(); - translate([0, -(frame_y-frame_wall)/2, 9]) front_stripe(); - translate([0, -(frame_y-frame_wall)/2, 0]) front_stripe(); - translate([0, -(frame_y-frame_wall)/2, -9]) front_stripe(); - translate([0, -(frame_y-frame_wall)/2, -18]) front_stripe(); - // subtract the inner wall area that will be provided by the other piece - front_or_back_inner_wall_frame_piece(); - } -} - -horiz_striped_windowed_front_or_back_box_frame_piece(); diff --git a/src/frames/pieces/box/front-or-back-windowed.scad b/src/frames/pieces/box/front-or-back-windowed.scad deleted file mode 100644 index 22b6c10..0000000 --- a/src/frames/pieces/box/front-or-back-windowed.scad +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use -use - -module front_or_back_window() { - translate([0, -frame_y/2, 0]) - cube([frame_x-frame_mount_column_width*3.5, (frame_wall+panel_support_width)*2, - frame_z-panel_z*3], center=true); -} - -module windowed_front_or_back_box_frame_piece() { - difference() { - front_or_back_box_frame_piece(); - // subtract frame wall window - front_or_back_window(); - // subtract the inner wall area that will be provided by the other piece - front_or_back_inner_wall_frame_piece(); - } -} - -windowed_front_or_back_box_frame_piece(); diff --git a/src/frames/pieces/box/front-or-back.scad b/src/frames/pieces/box/front-or-back.scad deleted file mode 100644 index 1077773..0000000 --- a/src/frames/pieces/box/front-or-back.scad +++ /dev/null @@ -1,30 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use - -module front_or_back_box_frame_piece() { - piece_width = panel_support_width+frame_wall+frame_mount_column_width; - intersection() { - left_frame(); - difference() { - // include the whole bottom wall (including mount columns) - translate([0, -(frame_y/2)+(piece_width/2), 0]) cube([frame_x, piece_width, frame_z], center=true); - // ...minus the frame wall and lip on the left - translate([-frame_x/2+frame_wall/2, 0, 0]) - cube([frame_wall, frame_y-frame_wall*2, frame_z], center=true); - linear_extrude(height=frame_z, center=true) polygon([ - [-frame_x/2, -frame_y/2], [-frame_x/2+frame_wall, -frame_y/2+frame_wall], - [-frame_x/2, -frame_y/2+frame_wall] - ]); - // ...minus a slot for the combining piece to go into - cube([frame_x, frame_y-(panel_support_width+frame_wall)*2, inner_frame_z/3], center=true); - } - } -} - -front_or_back_box_frame_piece(); diff --git a/src/frames/pieces/box/side-inner-wall.scad b/src/frames/pieces/box/side-inner-wall.scad deleted file mode 100644 index 596cd50..0000000 --- a/src/frames/pieces/box/side-inner-wall.scad +++ /dev/null @@ -1,43 +0,0 @@ -/* The inner side wall of the frame, for being displayed through a windowed part. - * - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use - -module mount_column_cutout() { - intersection() { - frame_mount_column(); - cube([frame_mount_column_width*3/2, frame_mount_column_width*3/2, inner_frame_z*21/24], center=true); - } -} - -module side_inner_wall_frame_base_piece() { - difference() { - // Z is scaled so that some part of the original part inner wall is retained - scale([1, 1, inner_frame_z_decorative_scale]) side_box_frame_piece(); - // minus the outer wall - translate([-(frame_x-frame_wall)/2, 0, 0]) cube([frame_wall, frame_y, frame_z], center=true); - // minus half of the mounting posts (the other half provided by the outer wall) - translate([-panel_to_frame_point_x, panel_to_frame_point_y, inner_frame_z/2]) rotate([0, 0, 90]) - mount_column_cutout(); - translate([-panel_to_frame_point_x, -(panel_to_frame_point_y), -inner_frame_z/2]) rotate([0, 0, 180]) - mount_column_cutout(); - translate([-panel_to_frame_point_x, panel_to_frame_point_y, -inner_frame_z/2]) rotate([0, 0, 90]) - mount_column_cutout(); - translate([-panel_to_frame_point_x, -(panel_to_frame_point_y), inner_frame_z/2]) rotate([0, 0, 180]) - mount_column_cutout(); - } -} - -module side_inner_wall_frame_piece() { - side_inner_wall_frame_base_piece(); - // extend the outward face 2mm in order to have it cut deeper into the frame outer wall - translate([-(frame_x-frame_wall)/2, 0, 0]) rotate([0, 90, 0]) linear_extrude(height=2) projection() - translate([0, 0, 50]) rotate([0, -90, 0]) side_inner_wall_frame_base_piece(); -} - -side_inner_wall_frame_piece(); diff --git a/src/frames/pieces/box/side-windowed-backslashes.scad b/src/frames/pieces/box/side-windowed-backslashes.scad deleted file mode 100644 index 142b5ee..0000000 --- a/src/frames/pieces/box/side-windowed-backslashes.scad +++ /dev/null @@ -1,30 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use -use - -module backslashes() { - translate([-(frame_x-frame_wall)/2, -50, 0]) rotate([0, 0, -90]) slash_cutout(); - translate([-(frame_x-frame_wall)/2, -30, 0]) rotate([0, 0, -90]) slash_cutout(); - translate([-(frame_x-frame_wall)/2, -10, 0]) rotate([0, 0, -90]) slash_cutout(); - translate([-(frame_x-frame_wall)/2, 10, 0]) rotate([0, 0, -90]) slash_cutout(); - translate([-(frame_x-frame_wall)/2, 30, 0]) rotate([0, 0, -90]) slash_cutout(); - translate([-(frame_x-frame_wall)/2, 50, 0]) rotate([0, 0, -90]) slash_cutout(); -} - -module backslashes_windowed_side_box_frame_piece() { - difference() { - side_box_frame_piece(); - // subtract slashes from the frame wall - backslashes(); - // subtract the inner wall area that will be provided by the other piece - side_inner_wall_frame_piece(); - } -} - -backslashes_windowed_side_box_frame_piece(); diff --git a/src/frames/pieces/box/side-windowed-forwardslashes.scad b/src/frames/pieces/box/side-windowed-forwardslashes.scad deleted file mode 100644 index 366f4e2..0000000 --- a/src/frames/pieces/box/side-windowed-forwardslashes.scad +++ /dev/null @@ -1,22 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use -use -use - -module forwardslashes_windowed_side_box_frame_piece() { - difference() { - side_box_frame_piece(); - // subtract slashes from the frame wall - mirror([0, 0, 1]) backslashes(); - // subtract the inner wall area that will be provided by the other piece - side_inner_wall_frame_piece(); - } -} - -forwardslashes_windowed_side_box_frame_piece(); diff --git a/src/frames/pieces/box/side-windowed-horiz-stripes.scad b/src/frames/pieces/box/side-windowed-horiz-stripes.scad deleted file mode 100644 index f325e4b..0000000 --- a/src/frames/pieces/box/side-windowed-horiz-stripes.scad +++ /dev/null @@ -1,29 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use -use - -module side_stripe() { - cube([frame_wall, frame_y-(frame_mount_column_width*1.75)*2, 5], center=true); -} - -module horiz_striped_windowed_side_box_frame_piece() { - difference() { - side_box_frame_piece(); - // subtract frame wall windows - translate([-(frame_x-frame_wall)/2, 0, 18]) side_stripe(); - translate([-(frame_x-frame_wall)/2, 0, 9]) side_stripe(); - translate([-(frame_x-frame_wall)/2, 0, 0]) side_stripe(); - translate([-(frame_x-frame_wall)/2, 0, -9]) side_stripe(); - translate([-(frame_x-frame_wall)/2, 0, -18]) side_stripe(); - // subtract the inner wall area that will be provided by the other piece - side_inner_wall_frame_piece(); - } -} - -horiz_striped_windowed_side_box_frame_piece(); diff --git a/src/frames/pieces/box/side-windowed.scad b/src/frames/pieces/box/side-windowed.scad deleted file mode 100644 index 49b9849..0000000 --- a/src/frames/pieces/box/side-windowed.scad +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use -use - -module windowed_side_box_frame_piece() { - difference() { - side_box_frame_piece(); - // subtract frame wall window - translate([-frame_x/2, 0, 0]) - cube([(frame_wall+panel_support_width)*2, frame_y-frame_mount_column_width*3.5, - frame_z-panel_z*3], center=true); - // subtract the inner wall area that will be provided by the other piece - side_inner_wall_frame_piece(); - } -} - -windowed_side_box_frame_piece(); diff --git a/src/frames/pieces/box/side.scad b/src/frames/pieces/box/side.scad deleted file mode 100644 index 38ce0d1..0000000 --- a/src/frames/pieces/box/side.scad +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SPDX-FileCopyrightText: © 2024 Brian S. Stephan - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -include -include -use - -module side_box_frame_piece() { - piece_width = panel_support_width+frame_wall+frame_mount_column_width; - difference() { - // side piece is left/right agnostic - frame(); - // minus the top and bottom - front_or_back_box_frame_piece(); - rotate([180, 0, 0]) front_or_back_box_frame_piece(); - // and just chop out the rest of the frame - translate([piece_width, 0, 0]) cube([frame_x, frame_y+1, frame_z+1], center=true); - } -} - -side_box_frame_piece(); diff --git a/src/frames/pieces/extended/front-or-back-aux-and-neutrik.scad b/src/frames/pieces/front-or-back-aux-and-neutrik.scad similarity index 100% rename from src/frames/pieces/extended/front-or-back-aux-and-neutrik.scad rename to src/frames/pieces/front-or-back-aux-and-neutrik.scad diff --git a/src/frames/pieces/extended/front-or-back-inner-wall.scad b/src/frames/pieces/front-or-back-inner-wall.scad similarity index 100% rename from src/frames/pieces/extended/front-or-back-inner-wall.scad rename to src/frames/pieces/front-or-back-inner-wall.scad diff --git a/src/frames/pieces/extended/front-or-back-trapezoid.scad b/src/frames/pieces/front-or-back-trapezoid.scad similarity index 100% rename from src/frames/pieces/extended/front-or-back-trapezoid.scad rename to src/frames/pieces/front-or-back-trapezoid.scad diff --git a/src/frames/pieces/extended/front-or-back-windowed-backslashes.scad b/src/frames/pieces/front-or-back-windowed-backslashes.scad similarity index 100% rename from src/frames/pieces/extended/front-or-back-windowed-backslashes.scad rename to src/frames/pieces/front-or-back-windowed-backslashes.scad diff --git a/src/frames/pieces/extended/front-or-back-windowed-forwardslashes.scad b/src/frames/pieces/front-or-back-windowed-forwardslashes.scad similarity index 100% rename from src/frames/pieces/extended/front-or-back-windowed-forwardslashes.scad rename to src/frames/pieces/front-or-back-windowed-forwardslashes.scad diff --git a/src/frames/pieces/extended/front-or-back-windowed-horiz-stripes.scad b/src/frames/pieces/front-or-back-windowed-horiz-stripes.scad similarity index 100% rename from src/frames/pieces/extended/front-or-back-windowed-horiz-stripes.scad rename to src/frames/pieces/front-or-back-windowed-horiz-stripes.scad diff --git a/src/frames/pieces/extended/front-or-back-windowed.scad b/src/frames/pieces/front-or-back-windowed.scad similarity index 100% rename from src/frames/pieces/extended/front-or-back-windowed.scad rename to src/frames/pieces/front-or-back-windowed.scad diff --git a/src/frames/pieces/extended/front-or-back.scad b/src/frames/pieces/front-or-back.scad similarity index 100% rename from src/frames/pieces/extended/front-or-back.scad rename to src/frames/pieces/front-or-back.scad diff --git a/src/frames/pieces/interconnect.scad b/src/frames/pieces/interconnect.scad index 15af595..002f75e 100644 --- a/src/frames/pieces/interconnect.scad +++ b/src/frames/pieces/interconnect.scad @@ -5,7 +5,7 @@ include include -use +use module interconnect_frame_half_piece() { translate([frame_x/2-frame_wall, 0, 0]) difference() { diff --git a/src/frames/pieces/extended/side-inner-wall.scad b/src/frames/pieces/side-inner-wall.scad similarity index 100% rename from src/frames/pieces/extended/side-inner-wall.scad rename to src/frames/pieces/side-inner-wall.scad diff --git a/src/frames/pieces/extended/side-longish.scad b/src/frames/pieces/side-longish.scad similarity index 100% rename from src/frames/pieces/extended/side-longish.scad rename to src/frames/pieces/side-longish.scad diff --git a/src/frames/pieces/extended/side-trapezoid-extended-to-front-trapezoid.scad b/src/frames/pieces/side-trapezoid-extended-to-front-trapezoid.scad similarity index 100% rename from src/frames/pieces/extended/side-trapezoid-extended-to-front-trapezoid.scad rename to src/frames/pieces/side-trapezoid-extended-to-front-trapezoid.scad diff --git a/src/frames/pieces/extended/side-trapezoid.scad b/src/frames/pieces/side-trapezoid.scad similarity index 100% rename from src/frames/pieces/extended/side-trapezoid.scad rename to src/frames/pieces/side-trapezoid.scad diff --git a/src/frames/pieces/extended/side-windowed-backslashes.scad b/src/frames/pieces/side-windowed-backslashes.scad similarity index 100% rename from src/frames/pieces/extended/side-windowed-backslashes.scad rename to src/frames/pieces/side-windowed-backslashes.scad diff --git a/src/frames/pieces/extended/side-windowed-forwardslashes.scad b/src/frames/pieces/side-windowed-forwardslashes.scad similarity index 100% rename from src/frames/pieces/extended/side-windowed-forwardslashes.scad rename to src/frames/pieces/side-windowed-forwardslashes.scad diff --git a/src/frames/pieces/extended/side-windowed-horiz-stripes.scad b/src/frames/pieces/side-windowed-horiz-stripes.scad similarity index 100% rename from src/frames/pieces/extended/side-windowed-horiz-stripes.scad rename to src/frames/pieces/side-windowed-horiz-stripes.scad diff --git a/src/frames/pieces/extended/side.scad b/src/frames/pieces/side.scad similarity index 100% rename from src/frames/pieces/extended/side.scad rename to src/frames/pieces/side.scad