Double surface details, higher angle, better modules

Guillotine/assembly.scad

@@ -1,6 +1,6 @@
 clean_buffer = 0.01;
 $fs = 0.2;
-//$t = 0.0;
+//$t = 0.3;
 
 include <blade.scad>;
 include <frame.scad>;
@@ -9,8 +9,8 @@ color([0,0.5,0.4,1]) {
 	frame();
 }
 
-translate([8 + ($t * 30), 4.5, frame_depth]) {
-	rotate(-15) {
+translate([6 + ($t * 30), 11.8, frame_depth]) {
+	rotate(-30) {
 		blade_on_sled();
 	}
 }

Guillotine/frame.scad

@@ -2,19 +2,45 @@ frame_depth = 3.3;
 stock_inset_height = 0.5;
 stock_inset_depth = 1.0;
 
-header_width = 42.0;
-header_height = header_width * 0.2;
-footer_width = header_width * 1.05;
-footer_height = footer_width * 0.1;
+header_width = 45.0;
+header_height = header_width * 0.15;
+footer_width = header_width * 1.0;
+footer_height = header_height * 1.0;
 riser_width = header_width * 0.1;
-riser_height = header_height * 4.5;
+riser_height = header_height * 6.0;
 stock_width = header_width * 0.67;
 stock_height = stock_width * 0.67;
-stock_foot_height = footer_height * 1.25;
+stock_foot_height = footer_height * 1.0;
 neck_radius = stock_width / 5;
 
 header_riser_offset = ((header_width - stock_width) / 2) - riser_width;
 
+module stock_surface(surface_depth) {
+	translate([stock_height / 2, 0, surface_depth]) {
+		cube([stock_inset_height, stock_width, stock_inset_depth + clean_buffer]);
+	}
+	translate([0, 0, surface_depth]) {
+		cube([stock_height, stock_inset_height, stock_inset_depth + clean_buffer]);
+	}
+	translate([0, stock_width - stock_inset_height, surface_depth]) {
+		cube([stock_height, stock_inset_height, stock_inset_depth + clean_buffer]);
+	}
+}
+
+module stock(stock_translate) {
+	translate(stock_translate) {
+		difference() {
+			cube([stock_height, stock_width, frame_depth]);
+			translate([stock_height / 2, stock_width / 2, -clean_buffer]) {
+				cylinder(h = frame_depth + (clean_buffer * 2),
+					r1 = neck_radius, r2 = neck_radius);
+				}
+			stock_surface(frame_depth - stock_inset_depth);
+			stock_surface(0 - clean_buffer);
+		}
+	}
+}
+
 module frame() {
 	cube([header_height, header_width, frame_depth]);
 	translate([header_height, header_riser_offset, 0]) {
@@ -23,24 +49,7 @@ module frame() {
 			cube([riser_height + stock_height + stock_foot_height, riser_width, frame_depth]);
 		}
 	}
-	translate([header_height + riser_height, header_riser_offset + riser_width, 0]) {
-		difference() {
-		cube([stock_height, stock_width, frame_depth]);
-		translate([stock_height / 2, stock_width / 2, -clean_buffer]) {
-			cylinder(h = frame_depth + (clean_buffer * 2),
-				r1 = neck_radius, r2 = neck_radius);
-		}
-		translate([stock_height / 2, 0, frame_depth - stock_inset_depth]) {
-			cube([stock_inset_height, stock_width, stock_inset_depth + clean_buffer]);
-		}
-		translate([0, 0, frame_depth - stock_inset_depth]) {
-			cube([stock_height, stock_inset_height, stock_inset_depth + clean_buffer]);
-		}
-		translate([0, stock_width - stock_inset_height, frame_depth - stock_inset_depth]) {
-			cube([stock_height, stock_inset_height, stock_inset_depth + clean_buffer]);
-		}
-		}
-	}
+	stock([header_height + riser_height, header_riser_offset + riser_width, 0]);
 	translate([
 		header_height + riser_height + stock_height + stock_foot_height,
 		(header_width - footer_width) / 2,