diff options
-rw-r--r-- | testdata/scad/features/for-tests.scad | 6 | ||||
-rw-r--r-- | tests/regression/cgalpngtest/for-tests-expected.png | bin | 10995 -> 7124 bytes | |||
-rw-r--r-- | tests/regression/dumptest/for-tests-expected.csg | 18 | ||||
-rw-r--r-- | tests/regression/opencsgtest/for-tests-expected.png | bin | 11584 -> 7416 bytes | |||
-rw-r--r-- | tests/regression/throwntogethertest/for-tests-expected.png | bin | 6927 -> 7533 bytes |
5 files changed, 20 insertions, 4 deletions
diff --git a/testdata/scad/features/for-tests.scad b/testdata/scad/features/for-tests.scad index fe36789..10295b1 100644 --- a/testdata/scad/features/for-tests.scad +++ b/testdata/scad/features/for-tests.scad @@ -22,10 +22,10 @@ for(r=[1:2:6]) translate([r*10-30,30,0]) difference() {cylinder(r=r, center=true for(r=[1.5:0.2:2.5]) translate([r*10-30,30,0]) cube([1, 4*r, 2], center=true); // Negative range, negative step -for(r=[5:-1:1]) translate([r*10-60,40,0]) cylinder(r=r); +for(r=[5:-1:1]) translate([r*10-30,50,0]) cylinder(r=r); -// Negative range, positive step -for(r=[5:1:1]) translate([r*10-30,40,0]) cylinder(r=r); +// Negative range, positive step (using backward compatible auto swap of begin and end) +for(r=[5:1]) translate([r*10-30,40,0]) cylinder(r=r); // Zero step diff --git a/tests/regression/cgalpngtest/for-tests-expected.png b/tests/regression/cgalpngtest/for-tests-expected.png Binary files differindex bf1970a..65db59f 100644 --- a/tests/regression/cgalpngtest/for-tests-expected.png +++ b/tests/regression/cgalpngtest/for-tests-expected.png diff --git a/tests/regression/dumptest/for-tests-expected.csg b/tests/regression/dumptest/for-tests-expected.csg index 7aa29d7..b61d9cd 100644 --- a/tests/regression/dumptest/for-tests-expected.csg +++ b/tests/regression/dumptest/for-tests-expected.csg @@ -80,7 +80,23 @@ group() { cube(size = [1, 9.2, 2], center = true); } } - group(); + group() { + multmatrix([[1, 0, 0, 20], [0, 1, 0, 50], [0, 0, 1, 0], [0, 0, 0, 1]]) { + cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 5, r2 = 5, center = false); + } + multmatrix([[1, 0, 0, 10], [0, 1, 0, 50], [0, 0, 1, 0], [0, 0, 0, 1]]) { + cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 4, r2 = 4, center = false); + } + multmatrix([[1, 0, 0, 0], [0, 1, 0, 50], [0, 0, 1, 0], [0, 0, 0, 1]]) { + cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 3, r2 = 3, center = false); + } + multmatrix([[1, 0, 0, -10], [0, 1, 0, 50], [0, 0, 1, 0], [0, 0, 0, 1]]) { + cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 2, r2 = 2, center = false); + } + multmatrix([[1, 0, 0, -20], [0, 1, 0, 50], [0, 0, 1, 0], [0, 0, 0, 1]]) { + cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 1, r2 = 1, center = false); + } + } group() { multmatrix([[1, 0, 0, -20], [0, 1, 0, 40], [0, 0, 1, 0], [0, 0, 0, 1]]) { cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 1, r2 = 1, center = false); diff --git a/tests/regression/opencsgtest/for-tests-expected.png b/tests/regression/opencsgtest/for-tests-expected.png Binary files differindex 968659d..5218b8b 100644 --- a/tests/regression/opencsgtest/for-tests-expected.png +++ b/tests/regression/opencsgtest/for-tests-expected.png diff --git a/tests/regression/throwntogethertest/for-tests-expected.png b/tests/regression/throwntogethertest/for-tests-expected.png Binary files differindex 6641555..7b58005 100644 --- a/tests/regression/throwntogethertest/for-tests-expected.png +++ b/tests/regression/throwntogethertest/for-tests-expected.png |