remove imports of the box pieces, and duplicate them into "extended" pieces

this is the next step in getting rid of the 45 degree angle "box" pieces

Signed-off-by: Brian S. Stephan <bss@incorporeal.org>

src/frames/pieces/extended/front-or-back-inner-wall.scad

@@ -0,0 +1,39 @@
+/* The inner top/bottom wall of the frame, for being displayed through a windowed part.
+ *
+ * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <front-or-back.scad>
+
+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_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();

src/frames/pieces/extended/front-or-back-windowed-backslashes.scad

@@ -5,14 +5,36 @@
 
 include <parameters.scad>
 include <components.scad>
-use <frames/pieces/box/front-or-back-windowed-backslashes.scad>
+use <front-or-back.scad>
+use <front-or-back-inner-wall.scad>
 
-module backslashes_windowed_front_or_back_box_frame_piece_for_extended_side() {
+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_frame_piece() {
 	difference() {
-		backslashes_windowed_front_or_back_box_frame_piece();
+		front_or_back_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();
+	}
+}
+
+module backslashes_windowed_front_or_back_frame_piece_for_extended_side() {
+	difference() {
+		backslashes_windowed_front_or_back_frame_piece();
 		// ...minus the frame wall and lip on the left
 		translate([-frame_x/2+frame_wall/2, 0, 0]) cube([frame_wall, frame_y, frame_z], center=true);
 	}
 }
 
-backslashes_windowed_front_or_back_box_frame_piece_for_extended_side();
+backslashes_windowed_front_or_back_frame_piece_for_extended_side();

src/frames/pieces/extended/front-or-back-windowed-forwardslashes.scad

@@ -5,14 +5,26 @@
 
 include <parameters.scad>
 include <components.scad>
-use <frames/pieces/box/front-or-back-windowed-forwardslashes.scad>
+use <front-or-back.scad>
+use <front-or-back-inner-wall.scad>
+use <front-or-back-windowed-backslashes.scad>
 
-module forwardslashes_windowed_front_or_back_box_frame_piece_for_extended_side() {
+module forwardslashes_windowed_front_or_back_frame_piece() {
 	difference() {
-		forwardslashes_windowed_front_or_back_box_frame_piece();
+		front_or_back_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();
+	}
+}
+
+module forwardslashes_windowed_front_or_back_frame_piece_for_extended_side() {
+	difference() {
+		forwardslashes_windowed_front_or_back_frame_piece();
 		// ...minus the frame wall and lip on the left
 		translate([-frame_x/2+frame_wall/2, 0, 0]) cube([frame_wall, frame_y, frame_z], center=true);
 	}
 }
 
-forwardslashes_windowed_front_or_back_box_frame_piece_for_extended_side();
+forwardslashes_windowed_front_or_back_frame_piece_for_extended_side();

src/frames/pieces/extended/front-or-back-windowed-horiz-stripes.scad

@@ -5,14 +5,33 @@
 
 include <parameters.scad>
 include <components.scad>
-use <frames/pieces/box/front-or-back-windowed-horiz-stripes.scad>
+use <front-or-back.scad>
+use <front-or-back-inner-wall.scad>
 
-module horiz_striped_windowed_front_or_back_box_frame_piece_for_extended_side() {
+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_frame_piece() {
 	difference() {
-		horiz_striped_windowed_front_or_back_box_frame_piece();
+		front_or_back_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();
+	}
+}
+
+module horiz_striped_windowed_front_or_back_frame_piece_for_extended_side() {
+	difference() {
+		horiz_striped_windowed_front_or_back_frame_piece();
 		// ...minus the frame wall and lip on the left
 		translate([-frame_x/2+frame_wall/2, 0, 0]) cube([frame_wall, frame_y, frame_z], center=true);
 	}
 }
 
-horiz_striped_windowed_front_or_back_box_frame_piece_for_extended_side();
+horiz_striped_windowed_front_or_back_frame_piece_for_extended_side();

src/frames/pieces/extended/front-or-back-windowed.scad

@@ -5,14 +5,31 @@
 
 include <parameters.scad>
 include <components.scad>
-use <frames/pieces/box/front-or-back-windowed.scad>
+use <front-or-back.scad>
+use <front-or-back-inner-wall.scad>
 
-module windowed_front_or_back_box_frame_piece_for_extended_side() {
+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_frame_piece() {
 	difference() {
-		windowed_front_or_back_box_frame_piece();
+		front_or_back_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();
+	}
+}
+
+module windowed_front_or_back_frame_piece_for_extended_side() {
+	difference() {
+		windowed_front_or_back_frame_piece();
 		// ...minus the frame wall and lip on the left
 		translate([-frame_x/2+frame_wall/2, 0, 0]) cube([frame_wall, frame_y, frame_z], center=true);
 	}
 }
 
-windowed_front_or_back_box_frame_piece_for_extended_side();
+windowed_front_or_back_frame_piece_for_extended_side();

src/frames/pieces/extended/front-or-back.scad

@@ -5,13 +5,22 @@
 
 include <parameters.scad>
 include <components.scad>
-use <frames/pieces/box/front-or-back.scad>
+use <frames/complete/left-frame.scad>
+use <side.scad>
 
 module front_or_back_frame_piece() {
-	difference() {
-		front_or_back_box_frame_piece();
-		// ...minus the frame wall and lip on the left
-		translate([-frame_x/2+frame_wall/2, 0, 0]) cube([frame_wall, frame_y, frame_z], center=true);
+	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_z], center=true);
+			// ...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);
+		}
 	}
 }
 

src/frames/pieces/extended/side-inner-wall.scad

@@ -0,0 +1,43 @@
+/* The inner side wall of the frame, for being displayed through a windowed part.
+ *
+ * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <side.scad>
+
+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_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();

src/frames/pieces/extended/side-longish.scad

@@ -6,7 +6,7 @@
 include <parameters.scad>
 include <components.scad>
 use <frames/complete/left-frame.scad>
-use <frames/pieces/box/side.scad>
+use <side.scad>
 
 module side_frame_piece_wall() {
 	// get a slice of the piece, to use it in extruding
@@ -28,7 +28,7 @@ module side_frame_piece_extension() {
 
 module side_longish_frame_piece() {
 	difference() {
-		side_box_frame_piece();
+		side_frame_piece();
 		// chop off the old edge which is getting replaced with the extension
 		translate([-frame_x/2+frame_bevel_height/2, 0, 0]) cube([frame_bevel_height, frame_y, frame_z], center=true);
 	}

src/frames/pieces/extended/side-trapezoid-extended-to-front-trapezoid.scad

@@ -6,7 +6,7 @@
 include <parameters.scad>
 include <components.scad>
 use <frames/complete/left-frame.scad>
-use <frames/pieces/box/side.scad>
+use <side.scad>
 use <front-or-back-trapezoid.scad>
 
 module side_and_bottom_frame_piece_wall() {
@@ -28,7 +28,7 @@ module side_and_bottom_frame_piece_extension() {
 
 module side_trapezoid_extended_to_front_frame_piece() {
 	difference() {
-		side_box_frame_piece();
+		side_frame_piece();
 		// chop off the old edge which is getting replaced with the extension
 		translate([-frame_x/2+frame_bevel_height/2, 0, 0]) cube([frame_bevel_height, frame_y, frame_z], center=true);
 	}

src/frames/pieces/extended/side-trapezoid.scad

@@ -6,7 +6,7 @@
 include <parameters.scad>
 include <components.scad>
 use <frames/complete/left-frame.scad>
-use <frames/pieces/box/side.scad>
+use <side.scad>
 
 module side_frame_piece_wall() {
 	// get a slice of the piece, to use it in extruding
@@ -26,7 +26,7 @@ module side_frame_piece_extension() {
 
 module side_trapezoid_frame_piece() {
 	difference() {
-		side_box_frame_piece();
+		side_frame_piece();
 		// chop off the old edge which is getting replaced with the extension
 		translate([-frame_x/2+frame_bevel_height/2, 0, 0]) cube([frame_bevel_height, frame_y, frame_z], center=true);
 	}

src/frames/pieces/extended/side-windowed-backslashes.scad

@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <side.scad>
+use <side-inner-wall.scad>
+
+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_frame_piece() {
+	difference() {
+		side_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_frame_piece();

src/frames/pieces/extended/side-windowed-forwardslashes.scad

@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <side.scad>
+use <side-inner-wall.scad>
+use <side-windowed-backslashes.scad>
+
+module forwardslashes_windowed_side_frame_piece() {
+	difference() {
+		side_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_frame_piece();

src/frames/pieces/extended/side-windowed-horiz-stripes.scad

@@ -0,0 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: © 2024 Brian S. Stephan <bss@incorporeal.org>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+include <parameters.scad>
+include <components.scad>
+use <side.scad>
+use <side-inner-wall.scad>
+
+module side_stripe() {
+	cube([frame_wall, frame_y-(frame_mount_column_width*1.75)*2, 5], center=true);
+}
+
+module horiz_striped_windowed_side_frame_piece() {
+	difference() {
+		side_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_frame_piece();

src/frames/pieces/interconnect.scad

@@ -5,11 +5,11 @@
 
 include <parameters.scad>
 include <components.scad>
-use <box/side.scad>
+use <extended/side.scad>
 
 module interconnect_frame_half_piece() {
 	translate([frame_x/2-frame_wall, 0, 0]) difference() {
-		side_box_frame_piece();
+		side_frame_piece();
 		rotate([0, 0, 180]) side_chopper();
 	}
 }