grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-01 09:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for cuboid() issue #307

Browse source
This commit is contained in:
Garth Minette 2020-10-29 16:46:07 -07:00
parent 1e193a090e
commit 40fde0f2b8
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
shapes.scad
View file

@ -78,14 +78,15 @@ module cuboid(
cnt = sum(e); cnt = sum(e);
r = first_defined([chamfer, rounding, 0]); r = first_defined([chamfer, rounding, 0]);
c = [min(r,size.x/2), min(r,size.y/2), min(r,size.z/2)]; c = [min(r,size.x/2), min(r,size.y/2), min(r,size.z/2)];
c2 = vmul(corner,c/2);
$fn = is_finite(chamfer)? 4 : segs(r); $fn = is_finite(chamfer)? 4 : segs(r);
translate(vmul(corner,size/2-c)) { translate(vmul(corner, size/2-c)) {
if (cnt == 0) { if (cnt == 0) {
cube(c*2, center=true); translate(c2) cube(c, center=true);
} else if (cnt == 1) { } else if (cnt == 1) {
if (e.x) xcyl(l=c.x*2, r=r); if (e.x) right(c2.x) xcyl(l=c.x, r=r);
if (e.y) ycyl(l=c.y*2, r=r); if (e.y) back (c2.y) ycyl(l=c.y, r=r);
if (e.z) zcyl(l=c.z*2, r=r); if (e.z) up (c2.z) zcyl(l=c.z, r=r);
} else if (cnt == 2) { } else if (cnt == 2) {
if (!e.x) { if (!e.x) {
intersection() { intersection() {
@ -152,9 +153,9 @@ module cuboid(
} else { } else {
isize = [for (v = size) max(0.001, v-2*chamfer)]; isize = [for (v = size) max(0.001, v-2*chamfer)];
hull() { hull() {
cube([size.x, isize.y, isize.z], center=true); cube([ size.x, isize.y, isize.z], center=true);
cube([isize.x, size.y, isize.z], center=true); cube([isize.x, size.y, isize.z], center=true);
cube([isize.x, isize.y, size.z], center=true); cube([isize.x, isize.y, size.z], center=true);
} }
} }
} else if (chamfer<0) { } else if (chamfer<0) {

2
version.scad
View file

@ -8,7 +8,7 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
BOSL_VERSION = [2,0,460]; BOSL_VERSION = [2,0,461];
// Section: BOSL Library Version Functions // Section: BOSL Library Version Functions