openscad/BOSL2
1
0
Fork 0
mirror of https://github.com/revarbat/BOSL2.git synced 2025-07-31 08:00:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #242 from kelvie/diff-tag-fix

Browse Source 
Fix diff/intersect when some tags are hidden
This commit is contained in:
Revar Desmera
2020-08-25 22:50:48 -07:00
committed by GitHub
parent 32c30c448e e5a0a3cad7
commit 248921df8d
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
attachments.scad
View File

@@ -1235,17 +1235,20 @@ module show(tags="")
// }
module diff(neg, pos=undef, keep=undef)
{
difference() {
if (pos != undef) {
show(pos) children();
} else {
if (keep == undef) {
hide(neg) children();
// Don't perform the operation if the current tags are hidden
if (attachment_is_shown($tags)) {
difference() {
if (pos != undef) {
show(pos) children();
} else {
hide(str(neg," ",keep)) children();
if (keep == undef) {
hide(neg) children();
} else {
hide(str(neg," ",keep)) children();
}
}
show(neg) children();
}
show(neg) children();
}
if (keep!=undef) {
show(keep) children();
@@ -1280,17 +1283,20 @@ module diff(neg, pos=undef, keep=undef)
// }
module intersect(a, b=undef, keep=undef)
{
intersection() {
if (b != undef) {
show(b) children();
} else {
if (keep == undef) {
hide(a) children();
// Don't perform the operation if the current tags are hidden
if (attachment_is_shown($tags)) {
intersection() {
if (b != undef) {
show(b) children();
} else {
hide(str(a," ",keep)) children();
if (keep == undef) {
hide(a) children();
} else {
hide(str(a," ",keep)) children();
}
}
show(a) children();
}
show(a) children();
}
if (keep!=undef) {
show(keep) children();