grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2024-12-29 16:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #973 from revarbat/revarbat_dev

Browse source 
Fix for issue #971
This commit is contained in:
Revar Desmera 2022-10-19 02:37:45 -07:00 committed by GitHub
commit 91ae9c9ce4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
shapes3d.scad
View file

@ -198,7 +198,7 @@ module cuboid(
(corner.x<0? xflip() : ident(4)) *
(corner.y<0? yflip() : ident(4)) *
(corner.z<0? zflip() : ident(4)) *
scale(s+[1,1,1]*0.01) *
scale(s+[1,1,1]*0.001) *
move(-[1,1,1]/2)
) polyhedron(
[[1,1,1],[1,1,0],[1,0,0],[0,1,1],[0,1,0],[1,0,1],[0,0,1]],
@ -241,39 +241,45 @@ module cuboid(
translate(c3) cube(m, center=true);
} else if (cnt == 1) {
if (e.x) {
mat = (corner.y<0? yflip() : ident(4)) *
(corner.z<0? zflip() : ident(4)) *
yrot(-90) * move(-[1,1]*0.01);
right(c3.x) {
intersection() {
xtcyl(l=m, r=r);
multmatrix(mat)
linear_extrude(height=m+0.1, center=true)
polygon([[r,0],[0.99*r,0],[0,0.99*r],[0,r],[r,r]]);
multmatrix(
(corner.y<0? yflip() : ident(4)) *
(corner.z<0? zflip() : ident(4))
) {
yrot(-90) linear_extrude(height=m+0.1, center=true) {
polygon([[r,0],[0.999*r,0],[0,0.999*r],[0,r],[r,r]]);
}
}
}
}
} else if (e.y) {
mat = (corner.x<0? xflip() : ident(4)) *
(corner.z<0? zflip() : ident(4)) *
xrot(90) * move(-[1,1]*0.01);
back(c3.y) {
intersection() {
ytcyl(l=m, r=r);
multmatrix(mat)
linear_extrude(height=m+0.1, center=true)
polygon([[r,0],[0.99*r,0],[0,0.99*r],[0,r],[r,r]]);
multmatrix(
(corner.x<0? xflip() : ident(4)) *
(corner.z<0? zflip() : ident(4))
) {
xrot(90) linear_extrude(height=m+0.1, center=true) {
polygon([[r,0],[0.999*r,0],[0,0.999*r],[0,r],[r,r]]);
}
}
}
}
} else if (e.z) {
mat = (corner.x<0? xflip() : ident(4)) *
(corner.y<0? yflip() : ident(4)) *
move(-[1,1]*0.01);
up(c3.z) {
intersection() {
zcyl(l=m, r=r);
multmatrix(mat)
linear_extrude(height=m+0.1, center=true)
polygon([[r,0],[0.99*r,0],[0,0.99*r],[0,r],[r,r]]);
multmatrix(
(corner.x<0? xflip() : ident(4)) *
(corner.y<0? yflip() : ident(4))
) {
linear_extrude(height=m+0.1, center=true) {
polygon([[r,0],[0.999*r,0],[0,0.999*r],[0,r],[r,r]]);
}
}
}
}
}