1
0
mirror of https://github.com/nophead/NopSCADlib.git synced 2025-08-04 14:37:24 +02:00

Screw_and_washer() no longer adds washers for countersunk screws.

This commit is contained in:
Chris Palmer
2020-05-18 15:29:19 +01:00
parent 02791c40ac
commit eadc541e8f

View File

@@ -259,22 +259,28 @@ module screw_countersink(type) { //! Countersink shape
module screw_and_washer(type, length, star = false, penny = false) { //! Screw with a washer which can be standard or penny and an optional star washer on top module screw_and_washer(type, length, star = false, penny = false) { //! Screw with a washer which can be standard or penny and an optional star washer on top
washer = screw_washer(type); washer = screw_washer(type);
head_type = screw_head_type(type);
translate_z(exploded() * 6) if(head_type != hs_cs && head_type != hs_cs_cap) {
if(penny) translate_z(exploded() * 6)
penny_washer(washer); if(penny)
else penny_washer(washer);
washer(washer); else
washer(washer);
translate_z(washer_thickness(washer)) { translate_z(washer_thickness(washer)) {
if(star) { if(star) {
translate_z(exploded() * 8) translate_z(exploded() * 8)
star_washer(washer); star_washer(washer);
translate_z(washer_thickness(washer)) translate_z(washer_thickness(washer))
screw(type, length);
}
else
screw(type, length); screw(type, length);
} }
else
screw(type, length);
} }
else
translate_z(eps)
screw(type, length);
} }