1
0
mirror of https://github.com/nophead/NopSCADlib.git synced 2025-09-03 12:22:46 +02:00

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

View File

@@ -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();
}
}