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

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
commit 248921df8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show stats 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) module diff(neg, pos=undef, keep=undef)
{ {
difference() { // Don't perform the operation if the current tags are hidden
if (pos != undef) { if (attachment_is_shown($tags)) {
show(pos) children(); difference() {
} else { if (pos != undef) {
if (keep == undef) { show(pos) children();
hide(neg) children();
} else { } 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) { if (keep!=undef) {
show(keep) children(); show(keep) children();
@ -1280,17 +1283,20 @@ module diff(neg, pos=undef, keep=undef)
// } // }
module intersect(a, b=undef, keep=undef) module intersect(a, b=undef, keep=undef)
{ {
intersection() { // Don't perform the operation if the current tags are hidden
if (b != undef) { if (attachment_is_shown($tags)) {
show(b) children(); intersection() {
} else { if (b != undef) {
if (keep == undef) { show(b) children();
hide(a) children();
} else { } 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) { if (keep!=undef) {
show(keep) children(); show(keep) children();