diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-01 20:11:15 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-01 20:11:15 (GMT) |
| commit | 84088dee5868094daec6007c0343c6b8a824d68f (patch) | |
| tree | 6538ed05975221ac1293e7a9fc95939cdab853db | |
| parent | f11009285220f4c033f98baeb7217e46a98107ca (diff) | |
Improved if-else test to include a multiple-children test
| -rw-r--r-- | testdata/scad/features/ifelse-tests.scad | 10 | ||||
| -rw-r--r-- | tests/regression/cgalpngtest/ifelse-tests-expected.png | bin | 9264 -> 8135 bytes | |||
| -rw-r--r-- | tests/regression/dumptest/ifelse-tests-expected.txt | 3 | ||||
| -rw-r--r-- | tests/regression/opencsgtest/ifelse-tests-expected.png | bin | 9650 -> 8465 bytes | |||
| -rw-r--r-- | tests/regression/throwntogethertest/ifelse-tests-expected.png | bin | 4999 -> 8474 bytes |
5 files changed, 11 insertions, 2 deletions
diff --git a/testdata/scad/features/ifelse-tests.scad b/testdata/scad/features/ifelse-tests.scad index d8c777b..3c72d55 100644 --- a/testdata/scad/features/ifelse-tests.scad +++ b/testdata/scad/features/ifelse-tests.scad @@ -1,5 +1,11 @@ -if (true) cube(2, true); -else cylinder(r=1,h=2); +if (true) { + cube(2, true); + translate([-3,0,0]) cube(2, true); +} +else { + cylinder(r=1,h=2); + translate([-3,0,0]) cylinder(r=1,h=2); +} translate([3,0,0]) if (false) cylinder(r=1,h=2); diff --git a/tests/regression/cgalpngtest/ifelse-tests-expected.png b/tests/regression/cgalpngtest/ifelse-tests-expected.png Binary files differindex fcda7bc..6680498 100644 --- a/tests/regression/cgalpngtest/ifelse-tests-expected.png +++ b/tests/regression/cgalpngtest/ifelse-tests-expected.png diff --git a/tests/regression/dumptest/ifelse-tests-expected.txt b/tests/regression/dumptest/ifelse-tests-expected.txt index 1b60002..e2d3fce 100644 --- a/tests/regression/dumptest/ifelse-tests-expected.txt +++ b/tests/regression/dumptest/ifelse-tests-expected.txt @@ -1,5 +1,8 @@ group() { cube(size = [2, 2, 2], center = true); + multmatrix([[1, 0, 0, -3], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { + cube(size = [2, 2, 2], center = true); + } } multmatrix([[1, 0, 0, 3], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) { group() { diff --git a/tests/regression/opencsgtest/ifelse-tests-expected.png b/tests/regression/opencsgtest/ifelse-tests-expected.png Binary files differindex 6dae4df..84e18e3 100644 --- a/tests/regression/opencsgtest/ifelse-tests-expected.png +++ b/tests/regression/opencsgtest/ifelse-tests-expected.png diff --git a/tests/regression/throwntogethertest/ifelse-tests-expected.png b/tests/regression/throwntogethertest/ifelse-tests-expected.png Binary files differindex 7f6374c..5cb1c4c 100644 --- a/tests/regression/throwntogethertest/ifelse-tests-expected.png +++ b/tests/regression/throwntogethertest/ifelse-tests-expected.png |
