From acd5de0fbd513b67387478b4c89a5ef4f11b440b Mon Sep 17 00:00:00 2001 From: Chris Palmer Date: Thu, 24 Dec 2020 08:56:54 +0000 Subject: [PATCH] Fixed extra BOM entries for woven sheet. Added render colour to BOM for 3D sheets. --- readme.md | 6 +++--- vitamins/sheet.scad | 16 ++++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/readme.md b/readme.md index 7b28605..4ba9933 100644 --- a/readme.md +++ b/readme.md @@ -3186,9 +3186,9 @@ When woven sheets (e.g. carbon fibre) are rendered it is necessary to specify th | 1 | ```sheet(PMMA3, 30, 30, 2)``` | Sheet acrylic 30mm x 30mm x 3mm | | 1 | ```sheet(PMMA6, 30, 30, 2)``` | Sheet acrylic 30mm x 30mm x 6mm | | 1 | ```sheet(PMMA8, 30, 30, 2)``` | Sheet acrylic 30mm x 30mm x 8mm | -| 2 | ```sheet(CF1, 30, 30, 2)``` | Sheet carbon fiber 30mm x 30mm x 1mm | -| 2 | ```sheet(CF2, 30, 30, 2)``` | Sheet carbon fiber 30mm x 30mm x 2mm | -| 2 | ```sheet(CF3, 30, 30, 2)``` | Sheet carbon fiber 30mm x 30mm x 3mm | +| 1 | ```sheet(CF1, 30, 30, 2)``` | Sheet carbon fiber 30mm x 30mm x 1mm | +| 1 | ```sheet(CF2, 30, 30, 2)``` | Sheet carbon fiber 30mm x 30mm x 2mm | +| 1 | ```sheet(CF3, 30, 30, 2)``` | Sheet carbon fiber 30mm x 30mm x 3mm | | 1 | ```sheet(glass2, 30, 30, 2)``` | Sheet glass 30mm x 30mm x 2mm | | 1 | ```sheet(Steel06, 30, 30, 2)``` | Sheet mild steel 30mm x 30mm x 0.6mm | diff --git a/vitamins/sheet.scad b/vitamins/sheet.scad index 3646398..382ebc3 100644 --- a/vitamins/sheet.scad +++ b/vitamins/sheet.scad @@ -91,10 +91,11 @@ module render_sheet(type, colour = false, colour2 = false, w = undef, d = undef) t = sheet_thickness(type); colour = colour ? colour : sheet_colour(type); colour2 = colour2 ? colour2 : sheet_colour2(type); - color(woven ? colour2 : colour) - render() - scale([1, 1, woven ? (t - 2 * eps) / t : 1]) - children(); + let($dxf_colour = colour) + color(woven ? colour2 : colour) + render() + scale([1, 1, woven ? (t - 2 * eps) / t : 1]) + children(); if(woven) for(side = [-1, 1], z = side * (t - eps) / 2) @@ -102,7 +103,8 @@ module render_sheet(type, colour = false, colour2 = false, w = undef, d = undef) woven_sheet(type, eps, colour, colour2, w, d) projection(cut = true) translate_z(-z) - children(); + not_on_bom() + children(); } module render_2D_sheet(type, colour = false, colour2 = false, w = undef, d = undef) { //! Extrude a 2D sheet template and give it the correct colour @@ -149,6 +151,8 @@ module woven_sheet(type, thickness, colour, colour2, w, d) {//! Create a woven 2 linear_extrude(thickness) intersection() { chequerboard(1); - children(); + + not_on_bom() + children(); } }