djsundog
/
NopSCADlib
mirror of https://github.com/DJSundog/NopSCADlib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed extra BOM entries for woven sheet. 

Added render colour to BOM for 3D sheets.
This commit is contained in:
Chris Palmer 2020-12-24 08:56:54 +00:00
parent cc1e3baaf6
commit acd5de0fbd
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
readme.md
View File

@ -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 |

16
vitamins/sheet.scad
View File

@ -91,10 +91,11 @@ 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);
color(woven ? colour2 : colour) let($dxf_colour = colour)
render() color(woven ? colour2 : colour)
scale([1, 1, woven ? (t - 2 * eps) / t : 1]) render()
children(); scale([1, 1, woven ? (t - 2 * eps) / t : 1])
children();
if(woven) if(woven)
for(side = [-1, 1], z = side * (t - eps) / 2) 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) woven_sheet(type, eps, colour, colour2, w, d)
projection(cut = true) projection(cut = true)
translate_z(-z) 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 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) linear_extrude(thickness)
intersection() { intersection() {
chequerboard(1); chequerboard(1);
children();
not_on_bom()
children();
} }
} }