Fixed extra BOM entries for woven sheet.
Added render colour to BOM for 3D sheets.
This commit is contained in:
parent
cc1e3baaf6
commit
acd5de0fbd
|
@ -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(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(PMMA6, 30, 30, 2)``` | Sheet acrylic 30mm x 30mm x 6mm |
|
||||||
| 1 | ```sheet(PMMA8, 30, 30, 2)``` | Sheet acrylic 30mm x 30mm x 8mm |
|
| 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 |
|
| 1 | ```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 |
|
| 1 | ```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(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(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 |
|
| 1 | ```sheet(Steel06, 30, 30, 2)``` | Sheet mild steel 30mm x 30mm x 0.6mm |
|
||||||
|
|
||||||
|
|
|
@ -91,6 +91,7 @@ module render_sheet(type, colour = false, colour2 = false, w = undef, d = undef)
|
||||||
t = sheet_thickness(type);
|
t = sheet_thickness(type);
|
||||||
colour = colour ? colour : sheet_colour(type);
|
colour = colour ? colour : sheet_colour(type);
|
||||||
colour2 = colour2 ? colour2 : sheet_colour2(type);
|
colour2 = colour2 ? colour2 : sheet_colour2(type);
|
||||||
|
let($dxf_colour = colour)
|
||||||
color(woven ? colour2 : colour)
|
color(woven ? colour2 : colour)
|
||||||
render()
|
render()
|
||||||
scale([1, 1, woven ? (t - 2 * eps) / t : 1])
|
scale([1, 1, woven ? (t - 2 * eps) / t : 1])
|
||||||
|
@ -102,6 +103,7 @@ module render_sheet(type, colour = false, colour2 = false, w = undef, d = undef)
|
||||||
woven_sheet(type, eps, colour, colour2, w, d)
|
woven_sheet(type, eps, colour, colour2, w, d)
|
||||||
projection(cut = true)
|
projection(cut = true)
|
||||||
translate_z(-z)
|
translate_z(-z)
|
||||||
|
not_on_bom()
|
||||||
children();
|
children();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -149,6 +151,8 @@ module woven_sheet(type, thickness, colour, colour2, w, d) {//! Create a woven 2
|
||||||
linear_extrude(thickness)
|
linear_extrude(thickness)
|
||||||
intersection() {
|
intersection() {
|
||||||
chequerboard(1);
|
chequerboard(1);
|
||||||
|
|
||||||
|
not_on_bom()
|
||||||
children();
|
children();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue