jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adapted to new root node behavior in master

Browse source
This commit is contained in:
Marius Kintel 2016-01-05 00:50:42 -05:00
parent caab2595e9
commit ec3ccbd281
2 changed files with 107 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
tests/regression/dumptest/background-modifier2-expected.csg
View file

@ -1,65 +1,63 @@
group() {
color([0, 0, 1, 1]) {
multmatrix([[1, 0, 0, -30], [0, 1, 0, -10], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [70, 50, 2], center = false);
}
multmatrix([[1, 0, 0, 40], [0, 1, 0, -10], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [2, 50, 30], center = false);
}
multmatrix([[1, 0, 0, -30], [0, 1, 0, 40], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [70, 2, 30], center = false);
}
color([0, 0, 1, 1]) {
multmatrix([[1, 0, 0, -30], [0, 1, 0, -10], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [70, 50, 2], center = false);
}
multmatrix([[1, 0, 0, -20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
multmatrix([[1, 0, 0, 40], [0, 1, 0, -10], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [2, 50, 30], center = false);
}
% multmatrix([[1, 0, 0, -20], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
multmatrix([[1, 0, 0, -30], [0, 1, 0, 40], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [70, 2, 30], center = false);
}
}
multmatrix([[1, 0, 0, -20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
% cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
multmatrix([[1, 0, 0, 20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
% intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
multmatrix([[1, 0, 0, 0], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
% sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
multmatrix([[1, 0, 0, 20], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
% cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
%multmatrix([[1, 0, 0, -20], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
% cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
multmatrix([[1, 0, 0, 20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
% intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
multmatrix([[1, 0, 0, 0], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
% sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
multmatrix([[1, 0, 0, 20], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
% cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}

110
tests/regression/dumptest/highlight-modifier2-expected.csg
View file

@ -1,65 +1,63 @@
group() {
color([0, 0, 1, 1]) {
multmatrix([[1, 0, 0, -30], [0, 1, 0, -10], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [70, 50, 2], center = false);
}
multmatrix([[1, 0, 0, 40], [0, 1, 0, -10], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [2, 50, 30], center = false);
}
multmatrix([[1, 0, 0, -30], [0, 1, 0, 40], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [70, 2, 30], center = false);
}
color([0, 0, 1, 1]) {
multmatrix([[1, 0, 0, -30], [0, 1, 0, -10], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [70, 50, 2], center = false);
}
multmatrix([[1, 0, 0, -20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
multmatrix([[1, 0, 0, 40], [0, 1, 0, -10], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [2, 50, 30], center = false);
}
multmatrix([[1, 0, 0, -30], [0, 1, 0, 40], [0, 0, 1, -10], [0, 0, 0, 1]]) {
cube(size = [70, 2, 30], center = false);
}
}
multmatrix([[1, 0, 0, -20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
# cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
multmatrix([[1, 0, 0, 0], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
# sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
multmatrix([[1, 0, 0, 20], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
# cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
multmatrix([[1, 0, 0, 20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
# intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
multmatrix([[1, 0, 0, -20], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
# difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
# cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
multmatrix([[1, 0, 0, 0], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
# sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
multmatrix([[1, 0, 0, 20], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
# cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
multmatrix([[1, 0, 0, 20], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
difference() {
# intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}
multmatrix([[1, 0, 0, -20], [0, 1, 0, 20], [0, 0, 1, 0], [0, 0, 0, 1]]) {
# difference() {
intersection() {
sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
cube(size = [15, 15, 15], center = true);
}
cylinder($fn = 0, $fa = 12, $fs = 2, h = 20, r1 = 5, r2 = 5, center = true);
}
}