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

cuboid() was slightly too large with rounding.

Browse source
This commit is contained in:
Revar Desmera 2020-04-10 14:28:08 -07:00
parent 5b7830f8f2
commit 0cdc94cc0a
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shapes.scad
View file

@ -186,7 +186,6 @@ module cuboid(
}
} else if (rounding != undef) {
sides = quantup(segs(rounding),4);
sc = 1/cos(180/sides);
if (edges == EDGES_ALL) {
if(rounding<0) {
cube(size, center=true);
@ -206,12 +205,12 @@ module cuboid(
minkowski() {
cube(isize, center=true);
if (trimcorners) {
sphere(r=rounding*sc, $fn=sides);
sphere(r=rounding, $fn=sides);
} else {
intersection() {
zrot(180/sides) cylinder(r=rounding*sc, h=rounding*2, center=true, $fn=sides);
rotate([90,0,0]) zrot(180/sides) cylinder(r=rounding*sc, h=rounding*2, center=true, $fn=sides);
rotate([0,90,0]) zrot(180/sides) cylinder(r=rounding*sc, h=rounding*2, center=true, $fn=sides);
zrot(180/sides) cylinder(r=rounding, h=rounding*2, center=true, $fn=sides);
rotate([90,0,0]) zrot(180/sides) cylinder(r=rounding, h=rounding*2, center=true, $fn=sides);
rotate([0,90,0]) zrot(180/sides) cylinder(r=rounding, h=rounding*2, center=true, $fn=sides);
}
}
}
@ -270,7 +269,7 @@ module cuboid(
rotate(majrots[axis]) cube([rounding*2, rounding*2, size[axis]+0.1], center=true);
}
translate(vmul(EDGE_OFFSETS[axis][i], size/2 - [1,1,1]*rounding)) {
rotate(majrots[axis]) zrot(180/sides) cylinder(h=size[axis]+0.2, r=rounding*sc, center=true, $fn=sides);
rotate(majrots[axis]) zrot(180/sides) cylinder(h=size[axis]+0.2, r=rounding, center=true, $fn=sides);
}
}
}
@ -285,7 +284,7 @@ module cuboid(
cube(rounding*2, center=true);
}
translate(vmul([xa,ya,za], size/2-[1,1,1]*rounding)) {
zrot(180/sides) sphere(r=rounding*sc*sc, $fn=sides);
zrot(180/sides) sphere(r=rounding, $fn=sides);
}
}
}

2
version.scad
View file

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